summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/math_emu.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2015-07-29 01:41:21 -0400
committerIngo Molnar <mingo@kernel.org>2015-07-31 13:31:10 +0200
commitba3e127ec105e790eeec4034d9769e018e4a1b54 (patch)
tree0bbb488d69d6eab7835f3c2246cc62cac29c6d27 /arch/x86/include/asm/math_emu.h
parentaf3e565a8542c4be699a0403b88fd6c691f5914f (diff)
downloadlinux-stable-ba3e127ec105e790eeec4034d9769e018e4a1b54.tar.gz
linux-stable-ba3e127ec105e790eeec4034d9769e018e4a1b54.tar.bz2
linux-stable-ba3e127ec105e790eeec4034d9769e018e4a1b54.zip
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: Brian 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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/math_emu.h')
-rw-r--r--arch/x86/include/asm/math_emu.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/include/asm/math_emu.h b/arch/x86/include/asm/math_emu.h
index 031f6266f425..0d9b14f60d2c 100644
--- a/arch/x86/include/asm/math_emu.h
+++ b/arch/x86/include/asm/math_emu.h
@@ -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;
- };
+ struct pt_regs *regs;
};
#endif /* _ASM_X86_MATH_EMU_H */