Commit 7994200c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Thomas Gleixner
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarThomas 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
parent f70c8006

arch/ia64/include/asm/siginfo.h

+0 −22
Original line number Diff line number Diff line 
/*

 * 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 */

arch/ia64/include/uapi/asm/siginfo.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

include/linux/signal.h

+1 −6
Original line number Diff line number Diff line
@@ -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.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE