diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:24:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:24:30 -0400 |
| commit | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (patch) | |
| tree | 39a93460aa2c6eb8286fbba6c551f95443e175dd /arch/x86/kernel/vmlinux_32.lds.S | |
| parent | 9042763808c5285a1a61b45b0fe98a710a4c903c (diff) | |
| parent | 63cc8c75156462d4b42cbdd76c293b7eee7ddbfe (diff) | |
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
"percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"
into x86/core
Conflicts:
arch/x86/kernel/cpu/common.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vmlinux_32.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 21b4f7eefaab..a9b8560adbc2 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -180,6 +180,7 @@ SECTIONS | |||
| 180 | . = ALIGN(PAGE_SIZE); | 180 | . = ALIGN(PAGE_SIZE); |
| 181 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { | 181 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { |
| 182 | __per_cpu_start = .; | 182 | __per_cpu_start = .; |
| 183 | *(.data.percpu.page_aligned) | ||
| 183 | *(.data.percpu) | 184 | *(.data.percpu) |
| 184 | *(.data.percpu.shared_aligned) | 185 | *(.data.percpu.shared_aligned) |
| 185 | __per_cpu_end = .; | 186 | __per_cpu_end = .; |