diff options
| author | Frederic Weisbecker | 2009-09-23 23:08:43 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-09-23 23:08:43 +0200 |
| commit | d7a4b414eed51f1653bb05ebe84122bf9a7ae18b (patch) | |
| tree | bd6603a0c27de4c138a1767871897e9cd3e1a1d2 /include/linux/kprobes.h | |
| parent | kprobes: Prevent re-registration of the same kprobe (diff) | |
| parent | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/... (diff) | |
| download | kernel-qcow2-linux-d7a4b414eed51f1653bb05ebe84122bf9a7ae18b.tar.gz kernel-qcow2-linux-d7a4b414eed51f1653bb05ebe84122bf9a7ae18b.tar.xz kernel-qcow2-linux-d7a4b414eed51f1653bb05ebe84122bf9a7ae18b.zip | |
Merge commit 'linus/master' into tracing/kprobes
Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c
Merge reason:
Sync with latest significant tracing core changes.
Diffstat (limited to 'include/linux/kprobes.h')
| -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 87eb79c9dd60..1b672f74a32f 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; |