Merge branch 'x86/core' into tracing/ftrace

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

diff --git a/kernel/module.c b/kernel/module.c
index f0e04d6b67d8cb325526dce1fdb456265ba3f926..8b742f2b3845b5d765a25014ac8361413938b40b 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2769,7 +2769,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;