diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /arch/powerpc/kernel/vmlinux.lds.S | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 895af44bf1f4..b9ef1644a722 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
| @@ -182,13 +182,7 @@ SECTIONS | |||
| 182 | __initramfs_end = .; | 182 | __initramfs_end = .; |
| 183 | } | 183 | } |
| 184 | #endif | 184 | #endif |
| 185 | . = ALIGN(PAGE_SIZE); | 185 | PERCPU(PAGE_SIZE) |
| 186 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { | ||
| 187 | __per_cpu_start = .; | ||
| 188 | *(.data.percpu) | ||
| 189 | *(.data.percpu.shared_aligned) | ||
| 190 | __per_cpu_end = .; | ||
| 191 | } | ||
| 192 | 186 | ||
| 193 | . = ALIGN(8); | 187 | . = ALIGN(8); |
| 194 | .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) { | 188 | .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) { |