git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-x86_64
/
kprobes.h
diff --git
a/include/asm-x86_64/kprobes.h
b/include/asm-x86_64/kprobes.h
index 4dd7a7e148d450d6ba93c347c655cc8975ac8230..d36febd9bb183d10c6625e26a79657fa0ae6ec1d 100644
(file)
--- a/
include/asm-x86_64/kprobes.h
+++ b/
include/asm-x86_64/kprobes.h
@@
-27,7
+27,10
@@
#include <linux/ptrace.h>
#include <linux/percpu.h>
#include <linux/ptrace.h>
#include <linux/percpu.h>
+#define __ARCH_WANT_KPROBES_INSN_SLOT
+
struct pt_regs;
struct pt_regs;
+struct kprobe;
typedef u8 kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION 0xcc
typedef u8 kprobe_opcode_t;
#define BREAKPOINT_INSTRUCTION 0xcc
@@
-40,8
+43,10
@@
typedef u8 kprobe_opcode_t;
#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
#define ARCH_SUPPORTS_KRETPROBES
#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
#define ARCH_SUPPORTS_KRETPROBES
+#define ARCH_INACTIVE_KPROBE_COUNT 1
void kretprobe_trampoline(void);
void kretprobe_trampoline(void);
+extern void arch_remove_kprobe(struct kprobe *p);
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {
/* Architecture specific copy of original instruction*/
struct arch_specific_insn {