diff options
| author | Kees Cook <keescook@chromium.org> | 2013-10-15 23:43:14 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-18 08:45:09 +0200 |
| commit | aec58bafaf89279522c44ec8ca9211eabb2b6976 (patch) | |
| tree | a22c5bfa255d386d9ec658c554cd6cd7ac3621b6 /arch/x86/tools | |
| parent | 6e6a4932b0f569b1a5bb4fcbf5dde1b1a42f01bb (diff) | |
| download | linux-stable-aec58bafaf89279522c44ec8ca9211eabb2b6976.tar.gz linux-stable-aec58bafaf89279522c44ec8ca9211eabb2b6976.tar.bz2 linux-stable-aec58bafaf89279522c44ec8ca9211eabb2b6976.zip | |
x86/relocs: Add percpu fixup for GNU ld 2.23
The GNU linker tries to put __per_cpu_load into the percpu area,
resulting in a lack of its relocation. Force this symbol to be
relocated. Seen starting with GNU ld 2.23 and later.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Michael Davidson <md@google.com>
Cc: Cong Ding <dinggnu@gmail.com>
Link: http://lkml.kernel.org/r/20131016064314.GA2739@www.outflux.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/tools')
| -rw-r--r-- | arch/x86/tools/relocs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 71a2533c90d3..11f9285a2ff6 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -729,6 +729,7 @@ static void percpu_init(void) * * The GNU linker incorrectly associates: * __init_begin + * __per_cpu_load * * The "gold" linker incorrectly associates: * init_per_cpu__irq_stack_union @@ -738,6 +739,7 @@ static int is_percpu_sym(ElfW(Sym) *sym, const char *symname) { return (sym->st_shndx == per_cpu_shndx) && strcmp(symname, "__init_begin") && + strcmp(symname, "__per_cpu_load") && strncmp(symname, "init_per_cpu_", 13); } |