git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
kprobes.c
diff --git
a/arch/ia64/kernel/kprobes.c
b/arch/ia64/kernel/kprobes.c
index
781960f
..
f9039f8
100644
(file)
--- a/
arch/ia64/kernel/kprobes.c
+++ b/
arch/ia64/kernel/kprobes.c
@@
-23,6
+23,7
@@
* <anil.s.keshavamurthy@intel.com> adapted from i386
*/
* <anil.s.keshavamurthy@intel.com> adapted from i386
*/
+#include <linux/config.h>
#include <linux/kprobes.h>
#include <linux/ptrace.h>
#include <linux/string.h>
#include <linux/kprobes.h>
#include <linux/ptrace.h>
#include <linux/string.h>
@@
-448,20
+449,11
@@
int __kprobes arch_prepare_kprobe(struct kprobe *p)
return 0;
}
return 0;
}
-void __kprobes flush_insn_slot(struct kprobe *p)
-{
- unsigned long arm_addr;
-
- arm_addr = ((unsigned long)&p->opcode.bundle) & ~0xFULL;
- flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
-}
-
void __kprobes arch_arm_kprobe(struct kprobe *p)
{
unsigned long addr = (unsigned long)p->addr;
unsigned long arm_addr = addr & ~0xFULL;
void __kprobes arch_arm_kprobe(struct kprobe *p)
{
unsigned long addr = (unsigned long)p->addr;
unsigned long arm_addr = addr & ~0xFULL;
- flush_insn_slot(p);
memcpy((char *)arm_addr, &p->ainsn.insn.bundle, sizeof(bundle_t));
flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
}
memcpy((char *)arm_addr, &p->ainsn.insn.bundle, sizeof(bundle_t));
flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
}