aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-01-26 08:44:05 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-26 15:18:10 +0100
commit5a611268b69f05262936dd177205acbce4471358 (patch)
tree279e49c5b3f597790817959c63070ff989d51952 /include/asm-generic
parent99d0000f710f3432182761f65f9658f1cf0bf455 (diff)
downloadmrst-s0i3-test-5a611268b69f05262936dd177205acbce4471358.tar.gz
mrst-s0i3-test-5a611268b69f05262936dd177205acbce4471358.tar.xz
mrst-s0i3-test-5a611268b69f05262936dd177205acbce4471358.zip
generic, x86: fix __per_cpu_load relocation
This patch fixes this linker error: WARNING: Absolute relocations present Offset Info Type Sym.Value Sym.Name c0a4e07d 00e78001 R_386_32 c0ab0000 __per_cpu_load Now, __per_cpu_load is a section-relative symbol: c0aa4000 D __per_cpu_load c0aa4000 A __per_cpu_load_abs Signed-off-by: Brian Gerst <brgerst@gmail.com> 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, 4 insertions, 3 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 53e21f36a80..f3180a85c66 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -451,17 +451,18 @@
* end offset.
*/
#define PERCPU_VADDR(vaddr, phdr) \
- VMLINUX_SYMBOL(__per_cpu_load) = .; \
- .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
+ VMLINUX_SYMBOL(__per_cpu_load_abs) = .; \
+ .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load_abs) \
- 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) + SIZEOF(.data.percpu);
+ . = VMLINUX_SYMBOL(__per_cpu_load_abs) + SIZEOF(.data.percpu);
/**
* PERCPU - define output section for percpu area, simple version