lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  symbols, stacktrace: look up init symbols after module symbols
This commit is contained in:
Linus Torvalds
2009-04-03 17:34:41 -07:00
parent c7edad5fcb 4a44bac1f9
commit 30a39e0e97
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
kernel/extable.c
View File

@@ -41,6 +41,14 @@ const struct exception_table_entry *search_exception_tables(unsigned long addr)
return e; return e;
} }
static inline int init_kernel_text(unsigned long addr)
{
if (addr >= (unsigned long)_sinittext &&
addr <= (unsigned long)_einittext)
return 1;
return 0;
}
__notrace_funcgraph int core_kernel_text(unsigned long addr) __notrace_funcgraph int core_kernel_text(unsigned long addr)
{ {
if (addr >= (unsigned long)_stext && if (addr >= (unsigned long)_stext &&
@@ -48,8 +56,7 @@ __notrace_funcgraph int core_kernel_text(unsigned long addr)
return 1; return 1;
if (system_state == SYSTEM_BOOTING && if (system_state == SYSTEM_BOOTING &&
addr >= (unsigned long)_sinittext && init_kernel_text(addr))
addr <= (unsigned long)_einittext)
return 1; return 1;
return 0; return 0;
} }
@@ -58,7 +65,19 @@ __notrace_funcgraph int __kernel_text_address(unsigned long addr)
{ {
if (core_kernel_text(addr)) if (core_kernel_text(addr))
return 1; return 1;
return __module_text_address(addr) != NULL; if (__module_text_address(addr))
return 1;
/*
* There might be init symbols in saved stacktraces.
* Give those symbols a chance to be printed in
* backtraces (such as lockdep traces).
*
* Since we are after the module-symbols check, there's
* no danger of address overlap:
*/
if (init_kernel_text(addr))
return 1;
return 0;
} }
int kernel_text_address(unsigned long addr) int kernel_text_address(unsigned long addr)