aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-29 17:10:12 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-29 17:18:54 +0100
commitdba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (patch)
tree6373a843665115872a1476f43322c2e2ac185ea3 /include/asm-generic
parent4369f1fb7cd4cf777312f43e1cb9aa5504fc4125 (diff)
downloadmrst-s0i3-test-dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db.tar.gz
mrst-s0i3-test-dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db.tar.xz
mrst-s0i3-test-dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db.zip
Revert "generic, x86: fix __per_cpu_load relocation"
This reverts commit 5a611268b69f05262936dd177205acbce4471358. It is causing occasional boot crashes, caused by certain linker versions (GNU ld version 2.18.50.0.6-2 20080403) messing up: 82dcc000 D __per_cpu_load c16e6000 A __per_cpu_load_abs The __per_cpu_load value is out of whack. Hpa noticed the following detail: * (gdb) p/x -(0xc16e6000-0x82dcc000) * $2 = 0xc16e6000 * I.e. one is the other << 1 The two symbols should be equal. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index f3180a85c66..53e21f36a80 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -451,18 +451,17 @@
* end offset.
*/
#define PERCPU_VADDR(vaddr, phdr) \
- VMLINUX_SYMBOL(__per_cpu_load_abs) = .; \
- .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load_abs) \
+ VMLINUX_SYMBOL(__per_cpu_load) = .; \
+ .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
- LOAD_OFFSET) { \
VMLINUX_SYMBOL(__per_cpu_start) = .; \
- VMLINUX_SYMBOL(__per_cpu_load) = LOADADDR(.data.percpu) + LOAD_OFFSET;\
*(.data.percpu.first) \
*(.data.percpu.page_aligned) \
*(.data.percpu) \
*(.data.percpu.shared_aligned) \
VMLINUX_SYMBOL(__per_cpu_end) = .; \
} phdr \
- . = VMLINUX_SYMBOL(__per_cpu_load_abs) + SIZEOF(.data.percpu);
+ . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu);
/**
* PERCPU - define output section for percpu area, simple version