diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /include/asm-x86_64/kprobes.h | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/asm-x86_64/kprobes.h')
| -rw-r--r-- | include/asm-x86_64/kprobes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86_64/kprobes.h b/include/asm-x86_64/kprobes.h index d36febd9bb18..cf5317898fb0 100644 --- a/include/asm-x86_64/kprobes.h +++ b/include/asm-x86_64/kprobes.h | |||
| @@ -47,6 +47,7 @@ typedef u8 kprobe_opcode_t; | |||
| 47 | 47 | ||
| 48 | void kretprobe_trampoline(void); | 48 | void kretprobe_trampoline(void); |
| 49 | extern void arch_remove_kprobe(struct kprobe *p); | 49 | extern void arch_remove_kprobe(struct kprobe *p); |
| 50 | #define flush_insn_slot(p) do { } while (0) | ||
| 50 | 51 | ||
| 51 | /* Architecture specific copy of original instruction*/ | 52 | /* Architecture specific copy of original instruction*/ |
| 52 | struct arch_specific_insn { | 53 | struct arch_specific_insn { |