diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-20 16:13:26 (GMT) |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-20 16:13:26 (GMT) |
| commit | e8c500c2b64b6e237e67ecba7249e72363c47047 (patch) | |
| tree | e9c62e59a879ebef45b0fc2823d318b2fb2fed84 /arch/cris | |
| parent | c53badd0801728feedfcccae04239410b52b0d03 (diff) | |
| parent | a24c5a0ea902bcda348f086bd909cc2d6e305bf8 (diff) | |
| download | linux-fsl-qoriq-e8c500c2b64b6e237e67ecba7249e72363c47047.tar.xz | |
Merge branch 'slub/lockless' into for-linus
Conflicts:
include/linux/slub_def.h
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S index c49be84..728bbd9 100644 --- a/arch/cris/kernel/vmlinux.lds.S +++ b/arch/cris/kernel/vmlinux.lds.S @@ -102,7 +102,7 @@ SECTIONS #endif __vmlinux_end = .; /* Last address of the physical file. */ #ifdef CONFIG_ETRAX_ARCH_V32 - PERCPU(PAGE_SIZE) + PERCPU(32, PAGE_SIZE) .init.ramfs : { INIT_RAM_FS |