3 files changed, 13 insertions, 13 deletions

diff --git a/arch/ia64/kernel/brl_emu.c b/arch/ia64/kernel/brl_emu.c
index c0239bf77a09..782c481d7052 100644
--- a/arch/ia64/kernel/brl_emu.c
+++ b/arch/ia64/kernel/brl_emu.c
@@ -197,21 +197,21 @@ ia64_emulate_brl (struct pt_regs *regs, unsigned long ar_ec)
                  */
                 printk(KERN_DEBUG "Woah! Unimplemented Instruction Address Trap!\n");
                 force_sig_fault(SIGILL, ILL_BADIADDR, (void __user *)NULL,
-                                0, 0, 0, current);
+                                0, 0, 0);
         } else if (ia64_psr(regs)->tb) {
                 /*
                  *  Branch Tracing is enabled.
                  *  Force a taken branch signal.
                  */
                 force_sig_fault(SIGTRAP, TRAP_BRANCH, (void __user *)NULL,
-                                0, 0, 0, current);
+                                0, 0, 0);
         } else if (ia64_psr(regs)->ss) {
                 /*
                  *  Single Step is enabled.
                  *  Force a trace signal.
                  */
                 force_sig_fault(SIGTRAP, TRAP_TRACE, (void __user *)NULL,
-                                0, 0, 0, current);
+                                0, 0, 0);
         }
         return rv;
 }
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 0a3adbfebc2a..e13cb905930f 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -176,7 +176,7 @@ __kprobes ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
         }
         force_sig_fault(sig, code,
                         (void __user *) (regs->cr_iip + ia64_psr(regs)->ri),
-                        break_num, 0 /* clear __ISR_VALID */, 0, current);
+                        break_num, 0 /* clear __ISR_VALID */, 0);
 }
 
 /*
@@ -353,7 +353,7 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
                         }
                         force_sig_fault(SIGFPE, si_code,
                                         (void __user *) (regs->cr_iip + ia64_psr(regs)->ri),
-                                        0, __ISR_VALID, isr, current);
+                                        0, __ISR_VALID, isr);
                 }
         } else {
                 if (exception == -1) {
@@ -373,7 +373,7 @@ handle_fpu_swa (int fp_fault, struct pt_regs *regs, unsigned long isr)
                         }
                         force_sig_fault(SIGFPE, si_code,
                                         (void __user *) (regs->cr_iip + ia64_psr(regs)->ri),
-                                        0, __ISR_VALID, isr, current);
+                                        0, __ISR_VALID, isr);
                 }
         }
         return 0;
@@ -408,7 +408,7 @@ ia64_illegal_op_fault (unsigned long ec, long arg1, long arg2, long arg3,
 
         force_sig_fault(SIGILL, ILL_ILLOPC,
                         (void __user *) (regs.cr_iip + ia64_psr(&regs)->ri),
-                        0, 0, 0, current);
+                        0, 0, 0);
         return rv;
 }
 
@@ -483,7 +483,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                                                         + ia64_psr(&regs)->ri);
                         }
                         force_sig_fault(sig, code, addr,
-                                        vector, __ISR_VALID, isr, current);
+                                        vector, __ISR_VALID, isr);
                         return;
                 } else if (ia64_done_with_exception(&regs))
                         return;
@@ -493,7 +493,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
               case 31: /* Unsupported Data Reference */
                 if (user_mode(&regs)) {
                         force_sig_fault(SIGILL, ILL_ILLOPN, (void __user *) iip,
-                                        vector, __ISR_VALID, isr, current);
+                                        vector, __ISR_VALID, isr);
                         return;
                 }
                 sprintf(buf, "Unsupported data reference");
@@ -542,7 +542,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                                 == NOTIFY_STOP)
                         return;
                 force_sig_fault(SIGTRAP, si_code, (void __user *) ifa,
-                                0, __ISR_VALID, isr, current);
+                                0, __ISR_VALID, isr);
                 return;
 
               case 32: /* fp fault */
@@ -550,7 +550,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                 result = handle_fpu_swa((vector == 32) ? 1 : 0, &regs, isr);
                 if ((result < 0) || (current->thread.flags & IA64_THREAD_FPEMU_SIGFPE)) {
                         force_sig_fault(SIGFPE, FPE_FLTINV, (void __user *) iip,
-                                        0, __ISR_VALID, isr, current);
+                                        0, __ISR_VALID, isr);
                 }
                 return;
 
@@ -578,7 +578,7 @@ ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
                         if (user_mode(&regs)) {
                                 force_sig_fault(SIGILL, ILL_BADIADDR,
                                                 (void __user *) iip,
-                                                0, 0, 0, current);
+                                                0, 0, 0);
                                 return;
                         }
                         sprintf(buf, "Unimplemented Instruction Address fault");
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index a167a3824b35..eb7d5df59fa3 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
@@ -1537,6 +1537,6 @@ ia64_handle_unaligned (unsigned long ifa, struct pt_regs *regs)
         }
   force_sigbus:
         force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *) ifa,
-                        0, 0, 0, current);
+                        0, 0, 0);
         goto done;
 }