diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-31 15:05:31 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-30 22:35:32 -0400 |
commit | a6e6abd575fcbe6572ebc7a70ad616406d206fa8 (patch) | |
tree | 3909d2be063116936179bb4da85d5cb4aed32ce6 /kernel/extable.c | |
parent | e610499e2656e61975affd0af56b26eb73964c84 (diff) |
module: remove module_text_address()
Impact: Replace and remove risky (non-EXPORTed) API
module_text_address() returns a pointer to the module, which given locking
improvements in module.c, is useless except to test for NULL:
1) If the module can't go away, use __module_text_address.
2) Otherwise, just use is_module_text_address().
Cc: linux-mtd@lists.infradead.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
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 e136ed8d82ba..384f0da8a03e 100644 --- a/kernel/extable.c +++ b/kernel/extable.c | |||
@@ -58,14 +58,14 @@ __notrace_funcgraph int __kernel_text_address(unsigned long addr) | |||
58 | { | 58 | { |
59 | if (core_kernel_text(addr)) | 59 | if (core_kernel_text(addr)) |
60 | return 1; | 60 | return 1; |
61 | return __module_text_address(addr) != NULL; | 61 | return is_module_text_address(addr); |
62 | } | 62 | } |
63 | 63 | ||
64 | int kernel_text_address(unsigned long addr) | 64 | int kernel_text_address(unsigned long addr) |
65 | { | 65 | { |
66 | if (core_kernel_text(addr)) | 66 | if (core_kernel_text(addr)) |
67 | return 1; | 67 | return 1; |
68 | return module_text_address(addr) != NULL; | 68 | return is_module_text_address(addr); |
69 | } | 69 | } |
70 | 70 | ||
71 | /* | 71 | /* |
@@ -81,5 +81,5 @@ int func_ptr_is_kernel_text(void *ptr) | |||
81 | addr = (unsigned long) dereference_function_descriptor(ptr); | 81 | addr = (unsigned long) dereference_function_descriptor(ptr); |
82 | if (core_kernel_text(addr)) | 82 | if (core_kernel_text(addr)) |
83 | return 1; | 83 | return 1; |
84 | return module_text_address(addr) != NULL; | 84 | return is_module_text_address(addr); |
85 | } | 85 | } |