diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-20 18:13:26 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-20 18:13:26 +0200 |
| commit | e8c500c2b64b6e237e67ecba7249e72363c47047 (patch) | |
| tree | e9c62e59a879ebef45b0fc2823d318b2fb2fed84 /arch/s390/kernel | |
| parent | c53badd0801728feedfcccae04239410b52b0d03 (diff) | |
| parent | a24c5a0ea902bcda348f086bd909cc2d6e305bf8 (diff) | |
| download | talos-op-linux-e8c500c2b64b6e237e67ecba7249e72363c47047.tar.gz talos-op-linux-e8c500c2b64b6e237e67ecba7249e72363c47047.zip | |
Merge branch 'slub/lockless' into for-linus
Conflicts:
include/linux/slub_def.h
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index a68ac10213b2..1bc18cdb525b 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -77,7 +77,7 @@ SECTIONS . = ALIGN(PAGE_SIZE); INIT_DATA_SECTION(0x100) - PERCPU(PAGE_SIZE) + PERCPU(0x100, PAGE_SIZE) . = ALIGN(PAGE_SIZE); __init_end = .; /* freed after init ends here */ |
