diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:30:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:30:21 -0700 |
| commit | cab4e4c43f92582a2bfc026137b3d8a175bd0360 (patch) | |
| tree | 2f0e8fbc2e7d2d0cd6f1658a5e084a53b1e83a2e /kernel/extable.c | |
| parent | 5412b5399e095730008a14f2107331b2123733e4 (diff) | |
| parent | 49502677e11079c2e3e01867c922a894ce06a8be (diff) | |
| download | linux-3.10-cab4e4c43f92582a2bfc026137b3d8a175bd0360.tar.gz linux-3.10-cab4e4c43f92582a2bfc026137b3d8a175bd0360.tar.bz2 linux-3.10-cab4e4c43f92582a2bfc026137b3d8a175bd0360.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
module: use strstarts()
strstarts: helper function for !strncmp(str, prefix, strlen(prefix))
arm: allow usage of string functions in linux/string.h
module: don't use stop_machine on module load
module: create a request_module_nowait()
module: include other structures in module version check
module: remove the SHF_ALLOC flag on the __versions section.
module: clarify the force-loading taint message.
module: Export symbols needed for Ksplice
Ksplice: Add functions for walking kallsyms symbols
module: remove module_text_address()
module: __module_address
module: Make find_symbol return a struct kernel_symbol
kernel/module.c: fix an unused goto label
param: fix charp parameters set via sysfs
Fix trivial conflicts in kernel/extable.c manually.
Diffstat (limited to 'kernel/extable.c')
| -rw-r--r-- | kernel/extable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/extable.c b/kernel/extable.c index c46da6a4703..81e99d1f0d5 100644 --- a/kernel/extable.c +++ b/kernel/extable.c @@ -65,7 +65,7 @@ __notrace_funcgraph int __kernel_text_address(unsigned long addr) { if (core_kernel_text(addr)) return 1; - if (__module_text_address(addr)) + if (is_module_text_address(addr)) return 1; /* * There might be init symbols in saved stacktraces. @@ -84,7 +84,7 @@ int kernel_text_address(unsigned long addr) { if (core_kernel_text(addr)) return 1; - return module_text_address(addr) != NULL; + return is_module_text_address(addr); } /* @@ -100,5 +100,5 @@ int func_ptr_is_kernel_text(void *ptr) addr = (unsigned long) dereference_function_descriptor(ptr); if (core_kernel_text(addr)) return 1; - return module_text_address(addr) != NULL; + return is_module_text_address(addr); } |