From 74c511bbdb5833d67c3c80aebfaf9b8921127b12 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 22 Nov 2013 12:31:19 +0000 Subject: [PATCH] Revert "scripts/kallsyms: filter symbols not in kernel address space" Does not work with i386 KERNEXEC This reverts commit 27b840ea211f8a36fadabaa07ef94fb1b45730c3. --- scripts/kallsyms.c | 12 +----------- scripts/link-vmlinux.sh | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 9a11f9f..487ac6f 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c @@ -55,7 +55,6 @@ static struct sym_entry *table; static unsigned int table_size, table_cnt; static int all_symbols = 0; static char symbol_prefix_char = '\0'; -static unsigned long long kernel_start_addr = 0; int token_profit[0x10000]; @@ -66,10 +65,7 @@ unsigned char best_table_len[256]; static void usage(void) { - fprintf(stderr, "Usage: kallsyms [--all-symbols] " - "[--symbol-prefix=] " - "[--page-offset=] " - "< in.map > out.S\n"); + fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=] < in.map > out.S\n"); exit(1); } @@ -198,9 +194,6 @@ static int symbol_valid(struct sym_entry *s) int i; int offset = 1; - if (s->addr < kernel_start_addr) - return 0; - /* skip prefix char */ if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char) offset++; @@ -653,9 +646,6 @@ int main(int argc, char **argv) if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\'')) p++; symbol_prefix_char = *p; - } else if (strncmp(argv[i], "--page-offset=", 14) == 0) { - const char *p = &argv[i][14]; - kernel_start_addr = strtoull(p, NULL, 16); } else usage(); } diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 0d8d2ee..d482a0d 100644 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -82,8 +82,6 @@ kallsyms() kallsymopt="${kallsymopt} --all-symbols" fi - kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET" - local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" -- 1.8.4.3