diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:23:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:23:20 -0400 |
| commit | 0afe2db21394820d32646a695eccf3fbfe6ab5c7 (patch) | |
| tree | 6d925383f444a242ebc77d167420efb7e6ad8d99 /include/asm-generic | |
| parent | d84705969f898f294bc3fc32eca33580f14105bd (diff) | |
| parent | 43603c8df97f246e8be7b9cc92a8f968a85108bd (diff) | |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/asm-generic')
| -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 | } \ |