diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /include/asm-i386/kprobes.h | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'include/asm-i386/kprobes.h')
| -rw-r--r-- | include/asm-i386/kprobes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/kprobes.h b/include/asm-i386/kprobes.h index 0730a20f6db8..8774d06689da 100644 --- a/include/asm-i386/kprobes.h +++ b/include/asm-i386/kprobes.h | |||
| @@ -45,6 +45,7 @@ typedef u8 kprobe_opcode_t; | |||
| 45 | #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry | 45 | #define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry |
| 46 | #define ARCH_SUPPORTS_KRETPROBES | 46 | #define ARCH_SUPPORTS_KRETPROBES |
| 47 | #define ARCH_INACTIVE_KPROBE_COUNT 0 | 47 | #define ARCH_INACTIVE_KPROBE_COUNT 0 |
| 48 | #define flush_insn_slot(p) do { } while (0) | ||
| 48 | 49 | ||
| 49 | void arch_remove_kprobe(struct kprobe *p); | 50 | void arch_remove_kprobe(struct kprobe *p); |
| 50 | void kretprobe_trampoline(void); | 51 | void kretprobe_trampoline(void); |