diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:30:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:30:23 -0400 |
commit | 65a37b29a8d7492f081d4f8da2227467af1c0c1d (patch) | |
tree | 7d1121df648e8e692767034dbf979342623a6aed /arch/powerpc | |
parent | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (diff) | |
parent | 60db56422043aaa455ac7f858ce23c273220f9d9 (diff) |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 295ccc5e86b1..67f07f453385 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
@@ -181,14 +181,7 @@ SECTIONS | |||
181 | __initramfs_end = .; | 181 | __initramfs_end = .; |
182 | } | 182 | } |
183 | #endif | 183 | #endif |
184 | . = ALIGN(PAGE_SIZE); | 184 | PERCPU(PAGE_SIZE) |
185 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { | ||
186 | __per_cpu_start = .; | ||
187 | *(.data.percpu.page_aligned) | ||
188 | *(.data.percpu) | ||
189 | *(.data.percpu.shared_aligned) | ||
190 | __per_cpu_end = .; | ||
191 | } | ||
192 | 185 | ||
193 | . = ALIGN(8); | 186 | . = ALIGN(8); |
194 | .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) { | 187 | .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) { |