diff options
author | Tejun Heo <tj@kernel.org> | 2011-03-28 18:08:07 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-03-28 18:08:07 +0200 |
commit | ac24307b6910e7286910c1f227bd7951b87a3bae (patch) | |
tree | d36e3ef5233157e011f255108d317189542c51a6 /arch/powerpc/kernel/vmlinux.lds.S | |
parent | 5f55924deaa62d6df687c131fb92aebe071ec787 (diff) | |
parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) |
Merge branch 'for-2.6.40' into for-next
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
-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 b9150f07d266..920276c0f6a1 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -160,7 +160,7 @@ SECTIONS INIT_RAM_FS } - PERCPU(L1_CACHE_BYTES, PAGE_SIZE) + PERCPU_SECTION(L1_CACHE_BYTES) . = ALIGN(8); .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) { |