From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751501AbdFEIMG (ORCPT ); Mon, 5 Jun 2017 04:12:06 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45083 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751356AbdFEIMF (ORCPT ); Mon, 5 Jun 2017 04:12:05 -0400 Date: Mon, 5 Jun 2017 01:10:50 -0700 From: tip-bot for Christoph Hellwig Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, arnd@arndb.de, tglx@linutronix.de, tony.luck@intel.com, fenghua.yu@intel.com, davem@davemloft.net, linux-kernel@vger.kernel.org, hch@lst.de Reply-To: hpa@zytor.com, arnd@arndb.de, mingo@kernel.org, davem@davemloft.net, tglx@linutronix.de, fenghua.yu@intel.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, hch@lst.de In-Reply-To: <20170603190102.28866-3-hch@lst.de> References: <20170603190102.28866-3-hch@lst.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] ia64: Remove HAVE_ARCH_COPY_SIGINFO Git-Commit-ID: 7994200ce69a3873dfa2641254a13bb0a40056f3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 7994200ce69a3873dfa2641254a13bb0a40056f3 Gitweb: http://git.kernel.org/tip/7994200ce69a3873dfa2641254a13bb0a40056f3 Author: Christoph Hellwig AuthorDate: Sat, 3 Jun 2017 21:00:59 +0200 Committer: Thomas Gleixner CommitDate: Sun, 4 Jun 2017 15:11:46 +0200 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 Signed-off-by: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: Fenghua Yu Cc: Tony Luck Cc: linux-ia64@vger.kernel.org Cc: Arnd Bergmann Cc: sparclinux@vger.kernel.org Cc: "David S. Miller" Link: http://lkml.kernel.org/r/20170603190102.28866-3-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 6f2e2dd..dd2f2fc 100644 --- a/arch/ia64/include/asm/siginfo.h +++ b/arch/ia64/include/asm/siginfo.h @@ -1,23 +1 @@ -/* - * Based on . - * - * Modified 1998-2002 - * David Mosberger-Tang , Hewlett-Packard Co - */ -#ifndef _ASM_IA64_SIGINFO_H -#define _ASM_IA64_SIGINFO_H - -#include #include - -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 f72bf01..4694c64 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 diff --git a/include/linux/signal.h b/include/linux/signal.h index 1f5a166..80c7418 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -3,16 +3,13 @@ #include #include +#include struct task_struct; /* for sysctl */ extern int print_fatal_signals; -#ifndef HAVE_ARCH_COPY_SIGINFO - -#include - 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. */