Merge tag 'asm-generic-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[linux-2.6-block.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index f2a5578326adec96e3a7bb7b287fb60f001fcd07..83fcbaf0e82de0be624c64bcebf6bbdaeda855c6 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1718,9 +1718,8 @@ void force_sigsegv(int sig)
                force_sig(SIGSEGV);
 }
 
-int force_sig_fault_to_task(int sig, int code, void __user *addr
-       ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
-       , struct task_struct *t)
+int force_sig_fault_to_task(int sig, int code, void __user *addr,
+                           struct task_struct *t)
 {
        struct kernel_siginfo info;
 
@@ -1729,24 +1728,15 @@ int force_sig_fault_to_task(int sig, int code, void __user *addr
        info.si_errno = 0;
        info.si_code  = code;
        info.si_addr  = addr;
-#ifdef __ia64__
-       info.si_imm = imm;
-       info.si_flags = flags;
-       info.si_isr = isr;
-#endif
        return force_sig_info_to_task(&info, t, HANDLER_CURRENT);
 }
 
-int force_sig_fault(int sig, int code, void __user *addr
-       ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr))
+int force_sig_fault(int sig, int code, void __user *addr)
 {
-       return force_sig_fault_to_task(sig, code, addr
-                                      ___ARCH_SI_IA64(imm, flags, isr), current);
+       return force_sig_fault_to_task(sig, code, addr, current);
 }
 
-int send_sig_fault(int sig, int code, void __user *addr
-       ___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr)
-       , struct task_struct *t)
+int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t)
 {
        struct kernel_siginfo info;
 
@@ -1755,11 +1745,6 @@ int send_sig_fault(int sig, int code, void __user *addr
        info.si_errno = 0;
        info.si_code  = code;
        info.si_addr  = addr;
-#ifdef __ia64__
-       info.si_imm = imm;
-       info.si_flags = flags;
-       info.si_isr = isr;
-#endif
        return send_sig_info(info.si_signo, &info, t);
 }