From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755436AbbIHOad (ORCPT ); Tue, 8 Sep 2015 10:30:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52103 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754716AbbIHOa3 (ORCPT ); Tue, 8 Sep 2015 10:30:29 -0400 Date: Tue, 8 Sep 2015 07:29:20 -0700 From: tip-bot for Ingo Molnar Message-ID: Cc: tglx@linutronix.de, oleg@redhat.com, dvlasenk@redhat.com, luto@amacapital.net, brgerst@gmail.com, linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, mikko.rapeli@iki.fi, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org Reply-To: mikko.rapeli@iki.fi, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, oleg@redhat.com, dvlasenk@redhat.com, luto@amacapital.net, peterz@infradead.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, hpa@zytor.com In-Reply-To: <1441438363-9999-15-git-send-email-mingo@kernel.org> References: <1441438363-9999-15-git-send-email-mingo@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/headers] x86/headers: Remove direct sigcontext32.h uses Git-Commit-ID: 711531f4f3cb881f4598cddfcc36663101dee411 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: 711531f4f3cb881f4598cddfcc36663101dee411 Gitweb: http://git.kernel.org/tip/711531f4f3cb881f4598cddfcc36663101dee411 Author: Ingo Molnar AuthorDate: Sat, 5 Sep 2015 09:32:42 +0200 Committer: Ingo Molnar CommitDate: Tue, 8 Sep 2015 10:03:59 +0200 x86/headers: Remove direct sigcontext32.h uses Now that all sigcontext types are defined in asm/sigcontext.h, remove the various sigcontext32.h uses in the kernel. We still keep the header itself, which includes sigcontext.h, in case user-space relies on it. Acked-by: Mikko Rapeli Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1441438363-9999-15-git-send-email-mingo@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/ia32/ia32_signal.c | 2 +- arch/x86/include/asm/fpu/signal.h | 2 +- arch/x86/include/asm/ia32.h | 2 +- arch/x86/include/uapi/asm/sigcontext32.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index b421030..955ca03 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h index 7358e9d..856f4b3c 100644 --- a/arch/x86/include/asm/fpu/signal.h +++ b/arch/x86/include/asm/fpu/signal.h @@ -5,7 +5,7 @@ #define _ASM_X86_FPU_SIGNAL_H #ifdef CONFIG_X86_64 -# include +# include # include struct ksignal; int ia32_setup_rt_frame(int sig, struct ksignal *ksig, diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h index 3173b48..16edda2 100644 --- a/arch/x86/include/asm/ia32.h +++ b/arch/x86/include/asm/ia32.h @@ -10,7 +10,7 @@ * 32 bit structures for IA32 support. */ -#include +#include /* signal.h */ diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h index 257fbb3..a92b0f0 100644 --- a/arch/x86/include/uapi/asm/sigcontext32.h +++ b/arch/x86/include/uapi/asm/sigcontext32.h @@ -1,7 +1,7 @@ #ifndef _ASM_X86_SIGCONTEXT32_H #define _ASM_X86_SIGCONTEXT32_H -/* Signal context definitions for compat 32-bit programs: */ +/* This is a legacy file - all the type definitions are in sigcontext.h: */ #include