diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 18:42:05 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 18:42:05 +0300 |
| commit | 2a6c5176ecc87eaeb5b1e6d8e64deb9430f4e602 (patch) | |
| tree | e1bbad4b3c3775bc69fc41bc52103b494aca105e /arch/powerpc | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
| parent | b9ec40af0e18fb7d02106be148036c2ea490fdf9 (diff) | |
| download | linux-2a6c5176ecc87eaeb5b1e6d8e64deb9430f4e602.tar.xz | |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into slub/lockless
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 8a0deefac08d..b9150f07d266 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -160,7 +160,7 @@ SECTIONS INIT_RAM_FS } - PERCPU(PAGE_SIZE) + PERCPU(L1_CACHE_BYTES, PAGE_SIZE) . = ALIGN(8); .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) { |