Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[~andy/linux] / arch / arc / kernel / kprobes.c

diff --git a/arch/arc/kernel/kprobes.c b/arch/arc/kernel/kprobes.c
index 5a7b80e2d883127bebd85d598142e352f1b928ef..72f97822784a4627da66e835002c309b84dc14d9 100644 (file)
--- a/arch/arc/kernel/kprobes.c
+++ b/arch/arc/kernel/kprobes.c
@@ -517,8 +517,7 @@ int __kprobes arch_trampoline_kprobe(struct kprobe *p)
        return 0;
 }
 
-void trap_is_kprobe(unsigned long cause, unsigned long address,
-                   struct pt_regs *regs)
+void trap_is_kprobe(unsigned long address, struct pt_regs *regs)
 {
-       notify_die(DIE_TRAP, "kprobe_trap", regs, address, cause, SIGTRAP);
+       notify_die(DIE_TRAP, "kprobe_trap", regs, address, 0, SIGTRAP);
 }