linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ardb@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Ard Biesheuvel <ardb@kernel.org>,
	Jonathan Corbet <corbet@lwn.net>, Arnd Bergmann <arnd@arndb.de>,
	Tony Luck <tony.luck@intel.com>,
	Jessica Clarke <jrtc27@jrtc27.com>,
	John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
	Matthew Wilcox <willy@infradead.org>,
	Marc Zyngier <maz@kernel.org>, Guenter Roeck <linux@roeck-us.net>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-ia64@vger.kernel.org
Subject: [RFC PATCH 2/5] kernel: Drop IA64 support from sig_fault handlers
Date: Wed, 15 Feb 2023 11:00:05 +0100	[thread overview]
Message-ID: <20230215100008.2565237-3-ardb@kernel.org> (raw)
In-Reply-To: <20230215100008.2565237-1-ardb@kernel.org>

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
 include/linux/sched/signal.h | 17 ++++---------
 kernel/signal.c              | 25 ++++----------------
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h
index 20099268fa257f40..6aecfbf823656f6c 100644
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@ -303,20 +303,11 @@ static inline void kernel_signal_stop(void)
 
 	schedule();
 }
-#ifdef __ia64__
-# define ___ARCH_SI_IA64(_a1, _a2, _a3) , _a1, _a2, _a3
-#else
-# define ___ARCH_SI_IA64(_a1, _a2, _a3)
-#endif
 
-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(int sig, int code, void __user *addr
-	___ARCH_SI_IA64(int imm, unsigned int flags, unsigned long isr));
-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 force_sig_fault_to_task(int sig, int code, void __user *addr,
+			    struct task_struct *t);
+int force_sig_fault(int sig, int code, void __user *addr);
+int send_sig_fault(int sig, int code, void __user *addr, struct task_struct *t);
 
 int force_sig_mceerr(int code, void __user *, short);
 int send_sig_mceerr(int code, void __user *, short, struct task_struct *);
diff --git a/kernel/signal.c b/kernel/signal.c
index ae26da61c4d9fa6a..5b7f0bf2713901da 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1701,9 +1701,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;
 
@@ -1712,24 +1711,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;
 
@@ -1738,11 +1728,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);
 }
 
-- 
2.39.1


  parent reply	other threads:[~2023-02-15 10:01 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-15 10:00 [RFC PATCH 0/5] Retire IA64/Itanium support Ard Biesheuvel
2023-02-15 10:00 ` [RFC PATCH 1/5] arch: Remove Itanium (IA-64) architecture Ard Biesheuvel
2023-02-15 16:55   ` Guenter Roeck
2023-02-15 16:58   ` Guenter Roeck
2023-02-15 16:59     ` Ard Biesheuvel
2023-02-15 10:00 ` Ard Biesheuvel [this message]
2023-02-15 10:19   ` [RFC PATCH 2/5] kernel: Drop IA64 support from sig_fault handlers Arnd Bergmann
2023-02-15 11:13     ` Arnd Bergmann
2023-02-15 11:22       ` Ard Biesheuvel
2023-02-15 12:46         ` Arnd Bergmann
2023-02-15 10:00 ` [RFC PATCH 3/5] Documentation: Drop IA64 from feature descriptions Ard Biesheuvel
2023-02-15 10:00 ` [RFC PATCH 4/5] lib/raid6: Drop IA64 support Ard Biesheuvel
2023-02-15 10:00 ` [RFC PATCH 5/5] Documentation: Drop or replace remaining mentions of IA64 Ard Biesheuvel
2023-02-15 10:17 ` [RFC PATCH 0/5] Retire IA64/Itanium support John Paul Adrian Glaubitz
2023-02-15 19:30   ` Linus Torvalds
2023-02-15 19:42     ` Luck, Tony
2023-02-15 20:08       ` Linus Torvalds
2023-02-15 23:13         ` John Paul Adrian Glaubitz
2023-02-22 21:52           ` matoro
2023-02-16  5:04         ` Mike Rapoport
2023-02-15 23:09     ` John Paul Adrian Glaubitz
2023-02-15 16:50 ` Palmer Dabbelt
2023-02-15 17:00   ` Ard Biesheuvel
2023-02-15 18:20     ` Palmer Dabbelt
2023-03-17 22:55 ` Florian Weimer
2023-05-12 14:45   ` Ard Biesheuvel
2023-05-12 14:58     ` Florian Weimer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230215100008.2565237-3-ardb@kernel.org \
    --to=ardb@kernel.org \
    --cc=arnd@arndb.de \
    --cc=corbet@lwn.net \
    --cc=glaubitz@physik.fu-berlin.de \
    --cc=jrtc27@jrtc27.com \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=maz@kernel.org \
    --cc=tony.luck@intel.com \
    --cc=torvalds@linux-foundation.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).