Merge commit 'linus/master' into tracing/kprobes

[~andy/linux] / include / linux / kprobes.h

diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 87eb79c9dd6074a3e4708c84393418beb7a9c39b..1b672f74a32f0d76d27c277c759c6c3a24135674 100644 (file)
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -48,13 +48,13 @@
 #define KPROBE_HIT_SSDONE      0x00000008
 
 /* Attach to insert probes on any functions which should be ignored*/
-#define __kprobes      __attribute__((__section__(".kprobes.text"))) notrace
+#define __kprobes      __attribute__((__section__(".kprobes.text")))
 #else /* CONFIG_KPROBES */
 typedef int kprobe_opcode_t;
 struct arch_specific_insn {
        int dummy;
 };
-#define __kprobes      notrace
+#define __kprobes
 #endif /* CONFIG_KPROBES */
 
 struct kprobe;