git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
[pandora-kernel.git]
/
arch
/
mn10300
/
kernel
/
kprobes.c
diff --git
a/arch/mn10300/kernel/kprobes.c
b/arch/mn10300/kernel/kprobes.c
index
67e6389
..
0311a7f
100644
(file)
--- a/
arch/mn10300/kernel/kprobes.c
+++ b/
arch/mn10300/kernel/kprobes.c
@@
-377,8
+377,10
@@
void __kprobes arch_arm_kprobe(struct kprobe *p)
void __kprobes arch_disarm_kprobe(struct kprobe *p)
{
void __kprobes arch_disarm_kprobe(struct kprobe *p)
{
+#ifndef CONFIG_MN10300_CACHE_SNOOP
mn10300_dcache_flush();
mn10300_icache_inv();
mn10300_dcache_flush();
mn10300_icache_inv();
+#endif
}
void arch_remove_kprobe(struct kprobe *p)
}
void arch_remove_kprobe(struct kprobe *p)
@@
-390,8
+392,10
@@
void __kprobes disarm_kprobe(struct kprobe *p, struct pt_regs *regs)
{
*p->addr = p->opcode;
regs->pc = (unsigned long) p->addr;
{
*p->addr = p->opcode;
regs->pc = (unsigned long) p->addr;
+#ifndef CONFIG_MN10300_CACHE_SNOOP
mn10300_dcache_flush();
mn10300_icache_inv();
mn10300_dcache_flush();
mn10300_icache_inv();
+#endif
}
static inline
}
static inline