Skip to content

Commit decb4c4

Browse files
committed
x86/headers: Remove <asm/sigcontext.h> references on the kernel side
Now that all type definitions are in the UAPI header, include it directly, instead of through <asm/sigcontext.h>. [ We still keep asm/sigcontext.h, so that uapi/asm/sigcontext32.h can include <asm/sigcontext.h>. ] Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/1441438363-9999-16-git-send-email-mingo@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 711531f commit decb4c4

8 files changed

Lines changed: 9 additions & 7 deletions

File tree

arch/x86/ia32/ia32_signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <asm/ptrace.h>
2727
#include <asm/ia32_unistd.h>
2828
#include <asm/user32.h>
29-
#include <asm/sigcontext.h>
29+
#include <uapi/asm/sigcontext.h>
3030
#include <asm/proto.h>
3131
#include <asm/vdso.h>
3232
#include <asm/sigframe.h>

arch/x86/include/asm/fpu/signal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#define _ASM_X86_FPU_SIGNAL_H
66

77
#ifdef CONFIG_X86_64
8-
# include <asm/sigcontext.h>
8+
# include <uapi/asm/sigcontext.h>
99
# include <asm/user32.h>
1010
struct ksignal;
1111
int ia32_setup_rt_frame(int sig, struct ksignal *ksig,

arch/x86/include/asm/ia32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* 32 bit structures for IA32 support.
1111
*/
1212

13-
#include <asm/sigcontext.h>
13+
#include <uapi/asm/sigcontext.h>
1414

1515
/* signal.h */
1616

arch/x86/include/asm/processor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct vm86;
1111
#include <asm/math_emu.h>
1212
#include <asm/segment.h>
1313
#include <asm/types.h>
14-
#include <asm/sigcontext.h>
14+
#include <uapi/asm/sigcontext.h>
1515
#include <asm/current.h>
1616
#include <asm/cpufeature.h>
1717
#include <asm/page.h>

arch/x86/include/asm/sigcontext.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef _ASM_X86_SIGCONTEXT_H
22
#define _ASM_X86_SIGCONTEXT_H
33

4+
/* This is a legacy header - all kernel code includes <uapi/asm/sigcontext.h> directly. */
5+
46
#include <uapi/asm/sigcontext.h>
57

68
#endif /* _ASM_X86_SIGCONTEXT_H */

arch/x86/include/asm/sigframe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _ASM_X86_SIGFRAME_H
22
#define _ASM_X86_SIGFRAME_H
33

4-
#include <asm/sigcontext.h>
4+
#include <uapi/asm/sigcontext.h>
55
#include <asm/siginfo.h>
66
#include <asm/ucontext.h>
77
#include <linux/compat.h>

arch/x86/include/asm/signal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern void do_signal(struct pt_regs *regs);
3434

3535
#define __ARCH_HAS_SA_RESTORER
3636

37-
#include <asm/sigcontext.h>
37+
#include <uapi/asm/sigcontext.h>
3838

3939
#ifdef __i386__
4040

arch/x86/math-emu/fpu_emu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
#include "fpu_system.h"
7373

74-
#include <asm/sigcontext.h> /* for struct _fpstate */
74+
#include <uapi/asm/sigcontext.h> /* for struct _fpstate */
7575
#include <asm/math_emu.h>
7676
#include <linux/linkage.h>
7777

0 commit comments

Comments
 (0)