Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1656906

[PATCH 2/5] ia64: remove HAVE_ARCH_COPY_SIGINFO

Show all headers | View raw

Since ia64 defines __ARCH_SI_PREAMBLE_SIZE it can just use the generic
copy_siginfo implementation, which is identical to the architecture
specific one.

With that support for HAVE_ARCH_COPY_SIGINFO can go away entirely.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 arch/ia64/include/asm/siginfo.h      | 22 ----------------------
 arch/ia64/include/uapi/asm/siginfo.h |  1 -
 include/linux/signal.h               |  7 +------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/arch/ia64/include/asm/siginfo.h b/arch/ia64/include/asm/siginfo.h
index 6f2e2dd0f28f..dd2f2fce976b 100644
--- a/arch/ia64/include/asm/siginfo.h
+++ b/arch/ia64/include/asm/siginfo.h
@@ -1,23 +1 @@
-/*
- * Based on <asm-i386/siginfo.h>.
- *
- * Modified 1998-2002
- *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
- */
-#ifndef _ASM_IA64_SIGINFO_H
-#define _ASM_IA64_SIGINFO_H
-
-#include <linux/string.h>
 #include <uapi/asm/siginfo.h>
-
-static inline void
-copy_siginfo (siginfo_t *to, siginfo_t *from)
-{
-	if (from->si_code < 0)
-		memcpy(to, from, sizeof(siginfo_t));
-	else
-		/* _sigchld is currently the largest know union member */
-		memcpy(to, from, 4*sizeof(int) + sizeof(from->_sifields._sigchld));
-}
-
-#endif /* _ASM_IA64_SIGINFO_H */
diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
index f72bf0172bb2..4694c64252d6 100644
--- a/arch/ia64/include/uapi/asm/siginfo.h
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -11,7 +11,6 @@
 #define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
 
 #define HAVE_ARCH_SIGINFO_T
-#define HAVE_ARCH_COPY_SIGINFO
 #define HAVE_ARCH_COPY_SIGINFO_TO_USER
 
 #include <asm-generic/siginfo.h>
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 1f5a16620693..80c7418be359 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -3,16 +3,13 @@
 
 #include <linux/bug.h>
 #include <linux/signal_types.h>
+#include <linux/string.h>
 
 struct task_struct;
 
 /* for sysctl */
 extern int print_fatal_signals;
 
-#ifndef HAVE_ARCH_COPY_SIGINFO
-
-#include <linux/string.h>
-
 static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
 {
 	if (from->si_code < 0)
@@ -22,8 +19,6 @@ static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
 		memcpy(to, from, __ARCH_SI_PREAMBLE_SIZE + sizeof(from->_sifields._sigchld));
 }
 
-#endif
-
 /*
  * Define some primitives to manipulate sigset_t.
  */
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

untangle the <asm/siginfo.h> mess Christoph Hellwig <hch@lst.de> - 2017-06-03 21:10 +0200
  [PATCH 5/5] remove non-uapi <asm/siginfo.h> Christoph Hellwig <hch@lst.de> - 2017-06-03 21:10 +0200
    Re: [PATCH 5/5] remove non-uapi <asm/siginfo.h> Thomas Gleixner <tglx@linutronix.de> - 2017-06-04 15:20 +0200
      Re: [PATCH 5/5] remove non-uapi <asm/siginfo.h> Christoph Hellwig <hch@lst.de> - 2017-06-05 09:20 +0200
        Re: [PATCH 5/5] remove non-uapi <asm/siginfo.h> Thomas Gleixner <tglx@linutronix.de> - 2017-06-05 10:10 +0200
    [tip:timers/core] signal: Remove non-uapi <asm/siginfo.h> tip-bot for Christoph Hellwig <tipbot@zytor.com> - 2017-06-05 10:20 +0200
  [PATCH 2/5] ia64: remove HAVE_ARCH_COPY_SIGINFO Christoph Hellwig <hch@lst.de> - 2017-06-03 21:10 +0200
    [tip:timers/core] ia64: Remove HAVE_ARCH_COPY_SIGINFO tip-bot for Christoph Hellwig <tipbot@zytor.com> - 2017-06-05 10:20 +0200
  [PATCH 1/5] sparc: simplify <asm/siginfo.h> Christoph Hellwig <hch@lst.de> - 2017-06-03 21:10 +0200
    Re: [PATCH 1/5] sparc: simplify <asm/siginfo.h> David Miller <davem@davemloft.net> - 2017-06-03 23:20 +0200
    [tip:timers/core] sparc: Simplify <asm/siginfo.h> tip-bot for Christoph Hellwig <tipbot@zytor.com> - 2017-06-05 10:20 +0200
  Re: untangle the <asm/siginfo.h> mess Arnd Bergmann <arnd@arndb.de> - 2017-06-06 13:00 +0200

csiph-web