From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.outflux.net (smtp.outflux.net [IPv6:2001:19d0:2:6:c0de:0:736d:7470]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 7BC921A0330 for ; Thu, 5 Mar 2015 12:28:53 +1100 (AEDT) From: Kees Cook To: akpm@linux-foundation.org Subject: [PATCH v3 7/8] sparc: switch to using asm-generic for seccomp.h Date: Wed, 4 Mar 2015 17:27:07 -0800 Message-Id: <1425518828-16017-8-git-send-email-keescook@chromium.org> In-Reply-To: <1425518828-16017-1-git-send-email-keescook@chromium.org> References: <1425518828-16017-1-git-send-email-keescook@chromium.org> Cc: linux-mips@linux-mips.org, Peter Zijlstra , Will Deacon , Paul Mackerras , sparclinux@vger.kernel.org, linux-arch@vger.kernel.org, Russell King , Helge Deller , x86@kernel.org, "James E.J. Bottomley" , Ingo Molnar , Frederic Weisbecker , James Hogan , Laura Abbott , Kees Cook , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Michal Simek , linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org, Ralf Baechle , Daniel Borkmann , linuxppc-dev@lists.ozlabs.org, "David S. Miller" List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Switch to using the newly created asm-generic/seccomp.h for the seccomp strict mode syscall definitions. The obsolete sigreturn in COMPAT mode is retained as an override. Remaining definitions are identical. Also corrected missing #define for header reinclusion protection. Signed-off-by: Kees Cook --- arch/sparc/include/asm/seccomp.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/sparc/include/asm/seccomp.h b/arch/sparc/include/asm/seccomp.h index adca1bce41d4..5ef8826d44f8 100644 --- a/arch/sparc/include/asm/seccomp.h +++ b/arch/sparc/include/asm/seccomp.h @@ -1,15 +1,10 @@ #ifndef _ASM_SECCOMP_H +#define _ASM_SECCOMP_H #include -#define __NR_seccomp_read __NR_read -#define __NR_seccomp_write __NR_write -#define __NR_seccomp_exit __NR_exit -#define __NR_seccomp_sigreturn __NR_rt_sigreturn - -#define __NR_seccomp_read_32 __NR_read -#define __NR_seccomp_write_32 __NR_write -#define __NR_seccomp_exit_32 __NR_exit #define __NR_seccomp_sigreturn_32 __NR_sigreturn +#include + #endif /* _ASM_SECCOMP_H */ -- 1.9.1