aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2014-03-10 15:49:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-10 17:26:20 -0700
commit2930ffc7593b64fe00fd7c5a0a7f543078d73ed9 (patch)
treeb7bd345219075b3dfa4dca45e828311e2a4a627e /scripts
parent2216ee853017f9c9371106c5c02d4fe42f61cbfa (diff)
downloadlinux-2930ffc7593b64fe00fd7c5a0a7f543078d73ed9.tar.gz
revert "kallsyms: fix absolute addresses for kASLR"
Revert the recently applied 0f55159d091c ("kallsyms: fix absolute addresses for kASLR"). Kees said : This got NAKed, please don't apply -- this patch works for x86 and : ARM, but may cause problems for others: : : https://lkml.org/lkml/2014/2/24/718 It appears that Kees will be fixing all this up for 3.15. Cc: Andy Honig <ahonig@google.com> Cc: Kees Cook <keescook@chromium.org> Cc: Michal Marek <mmarek@suse.cz> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kallsyms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 276e84b8a8e..10085de886f 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -330,7 +330,8 @@ static void write_src(void)
printf("\tPTR\t_text + %#llx\n",
table[i].addr - _text);
else
- printf("\tPTR\t%#llx\n", table[i].addr);
+ printf("\tPTR\t_text - %#llx\n",
+ _text - table[i].addr);
} else {
printf("\tPTR\t%#llx\n", table[i].addr);
}