diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-16 21:16:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-16 21:16:37 +0200 |
| commit | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (patch) | |
| tree | 610700282791b0469bbf09921993857e0b0b51fe /include/linux | |
| parent | 983f2163e7fdf11a15e05816de243f93f07eafca (diff) | |
| parent | b36461da2a0389149d7f88f3cbc05a30d1db9faa (diff) | |
Merge branch 'tip/tracing/core4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kprobes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index bcd9c07848b..3a46b7b7abb 100644 --- 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; |