Эх сурвалжийг харах

ia64: Remove HAVE_ARCH_COPY_SIGINFO

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>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arch@vger.kernel.org
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: sparclinux@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>
Link: http://lkml.kernel.org/r/20170603190102.28866-3-hch@lst.de
Christoph Hellwig 8 жил өмнө
parent
commit
7994200ce6

+ 0 - 22
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>
 #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 */

+ 0 - 1
arch/ia64/include/uapi/asm/siginfo.h

@@ -11,7 +11,6 @@
 #define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
 #define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
 
 
 #define HAVE_ARCH_SIGINFO_T
 #define HAVE_ARCH_SIGINFO_T
-#define HAVE_ARCH_COPY_SIGINFO
 #define HAVE_ARCH_COPY_SIGINFO_TO_USER
 #define HAVE_ARCH_COPY_SIGINFO_TO_USER
 
 
 #include <asm-generic/siginfo.h>
 #include <asm-generic/siginfo.h>

+ 1 - 6
include/linux/signal.h

@@ -3,16 +3,13 @@
 
 
 #include <linux/bug.h>
 #include <linux/bug.h>
 #include <linux/signal_types.h>
 #include <linux/signal_types.h>
+#include <linux/string.h>
 
 
 struct task_struct;
 struct task_struct;
 
 
 /* for sysctl */
 /* for sysctl */
 extern int print_fatal_signals;
 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)
 static inline void copy_siginfo(struct siginfo *to, struct siginfo *from)
 {
 {
 	if (from->si_code < 0)
 	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));
 		memcpy(to, from, __ARCH_SI_PREAMBLE_SIZE + sizeof(from->_sifields._sigchld));
 }
 }
 
 
-#endif
-
 /*
 /*
  * Define some primitives to manipulate sigset_t.
  * Define some primitives to manipulate sigset_t.
  */
  */