diff --git a/[refs] b/[refs] index c1405c029be9..1fd97ca89c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ca6cca31ddc7cc8b1dc38b12d7593d2667defe8 +refs/heads/master: fe832a3a48737b24f95fab202b1c67fb588b071d diff --git a/trunk/include/linux/kprobes.h b/trunk/include/linux/kprobes.h index bcd9c07848be..3a46b7b7abb2 100644 --- a/trunk/include/linux/kprobes.h +++ b/trunk/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;