Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba3e127e authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/vm86: Clean up vm86.h includes 



vm86.h was being implicitly included in alot of places via
processor.h, which in turn got it from math_emu.h.  Break that
chain and explicitly include vm86.h in all files that need it.
Also remove unused vm86 field from math_emu_info.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1438148483-11932-7-git-send-email-brgerst@gmail.com


[ Fixed build failure. ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent af3e565a

arch/x86/include/asm/math_emu.h

+1 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _ASM_X86_MATH_EMU_H



#include <asm/ptrace.h>

#include <asm/vm86.h>



/* This structure matches the layout of the data saved to the stack

   following a device-not-present interrupt, part of it saved
@@ -10,9 +9,6 @@ 
   */

struct math_emu_info {

	long ___orig_eip;

	union {

	struct pt_regs *regs;

		struct kernel_vm86_regs *vm86;

	};

};

#endif /* _ASM_X86_MATH_EMU_H */

arch/x86/include/asm/syscalls.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ asmlinkage long sys_get_thread_area(struct user_desc __user *); 
asmlinkage unsigned long sys_sigreturn(void);



/* kernel/vm86_32.c */

struct vm86_struct;

asmlinkage long sys_vm86old(struct vm86_struct __user *);

asmlinkage long sys_vm86(unsigned long, unsigned long);

arch/x86/kernel/process_32.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <asm/syscalls.h>

#include <asm/debugreg.h>

#include <asm/switch_to.h>

#include <asm/vm86.h>



asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");

asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");

arch/x86/kernel/signal.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/vdso.h>

#include <asm/mce.h>

#include <asm/sighandling.h>

#include <asm/vm86.h>



#ifdef CONFIG_X86_64

#include <asm/proto.h>

arch/x86/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#include <asm/fpu/xstate.h>

#include <asm/trace/mpx.h>

#include <asm/mpx.h>

#include <asm/vm86.h>



#ifdef CONFIG_X86_64

#include <asm/x86_init.h>