diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 07:05:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 07:05:57 -0500 |
| commit | d040c1614c24162adc3fe106b182596999264e26 (patch) | |
| tree | 5af02052e633bcde0e33f77cac52ab4685ad07f1 /arch/x86/kernel/vmlinux_32.lds.S | |
| parent | d88316c243e5458a1888edbe0353c4dec6e61c73 (diff) | |
| parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) | |
Merge branch 'x86/core' into x86/headers
Diffstat (limited to 'arch/x86/kernel/vmlinux_32.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 82c67559dde7..3eba7f7bac05 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -178,14 +178,7 @@ SECTIONS | |||
| 178 | __initramfs_end = .; | 178 | __initramfs_end = .; |
| 179 | } | 179 | } |
| 180 | #endif | 180 | #endif |
| 181 | . = ALIGN(PAGE_SIZE); | 181 | PERCPU(PAGE_SIZE) |
| 182 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { | ||
| 183 | __per_cpu_start = .; | ||
| 184 | *(.data.percpu.page_aligned) | ||
| 185 | *(.data.percpu) | ||
| 186 | *(.data.percpu.shared_aligned) | ||
| 187 | __per_cpu_end = .; | ||
| 188 | } | ||
| 189 | . = ALIGN(PAGE_SIZE); | 182 | . = ALIGN(PAGE_SIZE); |
| 190 | /* freed after init ends here */ | 183 | /* freed after init ends here */ |
| 191 | 184 | ||