Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...

[linux-2.6-block.git] / arch / powerpc / kernel / traps.c

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 47df30982de1b5f25cdf0f600c58cfd0ec2b43dd..11caa0291254e9e5dfde5c549cb3ec3b10f902ca 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -297,7 +297,7 @@ NOKPROBE_SYMBOL(die);
 
 void user_single_step_report(struct pt_regs *regs)
 {
-       force_sig_fault(SIGTRAP, TRAP_TRACE, (void __user *)regs->nip, current);
+       force_sig_fault(SIGTRAP, TRAP_TRACE, (void __user *)regs->nip);
 }
 
 static void show_signal_msg(int signr, struct pt_regs *regs, int code,
@@ -363,7 +363,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
        if (!exception_common(signr, regs, code, addr))
                return;
 
-       force_sig_fault(signr, code, (void __user *)addr, current);
+       force_sig_fault(signr, code, (void __user *)addr);
 }
 
 /*