Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+9 -7
+1 -1
arch/x86/ia32/ia32_signal.c
··· 26 26 #include <asm/ptrace.h> 27 27 #include <asm/ia32_unistd.h> 28 28 #include <asm/user32.h> 29 - #include <asm/sigcontext.h> 29 + #include <uapi/asm/sigcontext.h> 30 30 #include <asm/proto.h> 31 31 #include <asm/vdso.h> 32 32 #include <asm/sigframe.h>
+1 -1
arch/x86/include/asm/fpu/signal.h
··· 5 5 #define _ASM_X86_FPU_SIGNAL_H 6 6 7 7 #ifdef CONFIG_X86_64 8 - # include <asm/sigcontext.h> 8 + # include <uapi/asm/sigcontext.h> 9 9 # include <asm/user32.h> 10 10 struct ksignal; 11 11 int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
+1 -1
arch/x86/include/asm/ia32.h
··· 10 10 * 32 bit structures for IA32 support. 11 11 */ 12 12 13 - #include <asm/sigcontext.h> 13 + #include <uapi/asm/sigcontext.h> 14 14 15 15 /* signal.h */ 16 16
+1 -1
arch/x86/include/asm/processor.h
··· 11 11 #include <asm/math_emu.h> 12 12 #include <asm/segment.h> 13 13 #include <asm/types.h> 14 - #include <asm/sigcontext.h> 14 + #include <uapi/asm/sigcontext.h> 15 15 #include <asm/current.h> 16 16 #include <asm/cpufeature.h> 17 17 #include <asm/page.h>
+2
arch/x86/include/asm/sigcontext.h
··· 1 1 #ifndef _ASM_X86_SIGCONTEXT_H 2 2 #define _ASM_X86_SIGCONTEXT_H 3 3 4 + /* This is a legacy header - all kernel code includes <uapi/asm/sigcontext.h> directly. */ 5 + 4 6 #include <uapi/asm/sigcontext.h> 5 7 6 8 #endif /* _ASM_X86_SIGCONTEXT_H */
+1 -1
arch/x86/include/asm/sigframe.h
··· 1 1 #ifndef _ASM_X86_SIGFRAME_H 2 2 #define _ASM_X86_SIGFRAME_H 3 3 4 - #include <asm/sigcontext.h> 4 + #include <uapi/asm/sigcontext.h> 5 5 #include <asm/siginfo.h> 6 6 #include <asm/ucontext.h> 7 7 #include <linux/compat.h>
+1 -1
arch/x86/include/asm/signal.h
··· 34 34 35 35 #define __ARCH_HAS_SA_RESTORER 36 36 37 - #include <asm/sigcontext.h> 37 + #include <uapi/asm/sigcontext.h> 38 38 39 39 #ifdef __i386__ 40 40
+1 -1
arch/x86/math-emu/fpu_emu.h
··· 71 71 72 72 #include "fpu_system.h" 73 73 74 - #include <asm/sigcontext.h> /* for struct _fpstate */ 74 + #include <uapi/asm/sigcontext.h> /* for struct _fpstate */ 75 75 #include <asm/math_emu.h> 76 76 #include <linux/linkage.h> 77 77