diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kallsyms.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 7b8b0f21a5b1..e694afa0eb8c 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c | |||
| @@ -30,20 +30,19 @@ | |||
| 30 | #define all_var 0 | 30 | #define all_var 0 |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | /* These will be re-linked against their real values during the second link stage */ | 33 | extern const unsigned long kallsyms_addresses[]; |
| 34 | extern const unsigned long kallsyms_addresses[] __attribute__((weak)); | 34 | extern const u8 kallsyms_names[]; |
| 35 | extern const u8 kallsyms_names[] __attribute__((weak)); | ||
| 36 | 35 | ||
| 37 | /* tell the compiler that the count isn't in the small data section if the arch | 36 | /* tell the compiler that the count isn't in the small data section if the arch |
| 38 | * has one (eg: FRV) | 37 | * has one (eg: FRV) |
| 39 | */ | 38 | */ |
| 40 | extern const unsigned long kallsyms_num_syms | 39 | extern const unsigned long kallsyms_num_syms |
| 41 | __attribute__((weak, section(".rodata"))); | 40 | __attribute__((__section__(".rodata"))); |
| 42 | 41 | ||
| 43 | extern const u8 kallsyms_token_table[] __attribute__((weak)); | 42 | extern const u8 kallsyms_token_table[]; |
| 44 | extern const u16 kallsyms_token_index[] __attribute__((weak)); | 43 | extern const u16 kallsyms_token_index[]; |
| 45 | 44 | ||
| 46 | extern const unsigned long kallsyms_markers[] __attribute__((weak)); | 45 | extern const unsigned long kallsyms_markers[]; |
| 47 | 46 | ||
| 48 | static inline int is_kernel_inittext(unsigned long addr) | 47 | static inline int is_kernel_inittext(unsigned long addr) |
| 49 | { | 48 | { |
| @@ -168,9 +167,6 @@ static unsigned long get_symbol_pos(unsigned long addr, | |||
| 168 | unsigned long symbol_start = 0, symbol_end = 0; | 167 | unsigned long symbol_start = 0, symbol_end = 0; |
| 169 | unsigned long i, low, high, mid; | 168 | unsigned long i, low, high, mid; |
| 170 | 169 | ||
| 171 | /* This kernel should never had been booted. */ | ||
| 172 | BUG_ON(!kallsyms_addresses); | ||
| 173 | |||
| 174 | /* do a binary search on the sorted kallsyms_addresses array */ | 170 | /* do a binary search on the sorted kallsyms_addresses array */ |
| 175 | low = 0; | 171 | low = 0; |
| 176 | high = kallsyms_num_syms; | 172 | high = kallsyms_num_syms; |
