projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
[powerpc.git]
/
include
/
asm-ia64
/
kprobes.h
diff --git
a/include/asm-ia64/kprobes.h
b/include/asm-ia64/kprobes.h
index
2abc98b
..
a93ce9e
100644
(file)
--- a/
include/asm-ia64/kprobes.h
+++ b/
include/asm-ia64/kprobes.h
@@
-82,10
+82,8
@@
struct kprobe_ctlblk {
struct prev_kprobe prev_kprobe[ARCH_PREV_KPROBE_SZ];
};
struct prev_kprobe prev_kprobe[ARCH_PREV_KPROBE_SZ];
};
-#define JPROBE_ENTRY(pentry) (kprobe_opcode_t *)pentry
-
#define ARCH_SUPPORTS_KRETPROBES
#define ARCH_SUPPORTS_KRETPROBES
-#define
ARCH_INACTIVE_KPROBE_COUNT 1
+#define
kretprobe_blacklist_size 0
#define SLOT0_OPCODE_SHIFT (37)
#define SLOT1_p1_OPCODE_SHIFT (37 - (64-46))
#define SLOT0_OPCODE_SHIFT (37)
#define SLOT1_p1_OPCODE_SHIFT (37 - (64-46))
@@
-120,6
+118,7
@@
struct arch_specific_insn {
unsigned short slot;
};
unsigned short slot;
};
+extern int kprobes_fault_handler(struct pt_regs *regs, int trapnr);
extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);
extern int kprobe_exceptions_notify(struct notifier_block *self,
unsigned long val, void *data);