Merge branch 'tracing/core-v2' into tracing-for-linus

[mv-sheeva.git] / kernel / module.c

diff --git a/kernel/module.c b/kernel/module.c
index f77ac320d0b51d021b52ba4c48dba5680e7c4d01..41f50605eed03e8ea0538c1ce2db52ee080f62dc 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2766,7 +2766,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;