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 /include/asm-generic/vmlinux.lds.h | |
| 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 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index cb752ba72466..7440a0dceddb 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -385,6 +385,7 @@ | |||
| 385 | . = ALIGN(align); \ | 385 | . = ALIGN(align); \ |
| 386 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ | 386 | VMLINUX_SYMBOL(__per_cpu_start) = .; \ |
| 387 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ | 387 | .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { \ |
| 388 | *(.data.percpu.page_aligned) \ | ||
| 388 | *(.data.percpu) \ | 389 | *(.data.percpu) \ |
| 389 | *(.data.percpu.shared_aligned) \ | 390 | *(.data.percpu.shared_aligned) \ |
| 390 | } \ | 391 | } \ |