Merge branches 'tracing/ftrace' and 'linus' into tracing/core

[linux-2.6-omap-h63xx.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index ba22484a987eb96a9d2bff0cdeede4b62a1d7156..22d7379709da83d8d7bdab21bc8f88f71bffc848 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2735,7 +2735,7 @@ int is_module_address(unsigned long addr)
 
 
 /* Is this a valid kernel address? */
-__notrace_funcgraph struct module *__module_text_address(unsigned long addr)
+struct module *__module_text_address(unsigned long addr)
 {
        struct module *mod;