summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/processor.h
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2015-07-19 21:09:06 -0400
committerIngo Molnar <mingo@kernel.org>2015-07-21 09:12:24 +0200
commited0b2edb61ba4e557de759093d965654186f28b2 (patch)
tree70bad0297c5626a3d2e4fc811921697d057affbe /arch/x86/include/asm/processor.h
parentdf1ae9a5dc66d9fd57109240042372b1065d984a (diff)
x86/entry/vm86: Move userspace accesses to do_sys_vm86()
Move the userspace accesses down into the common function in preparation for the next set of patches. Also change to copying the fields explicitly instead of assuming a fixed order in pt_regs and the kernel data structures. Signed-off-by: Brian Gerst <brgerst@gmail.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Denys Vlasenko <dvlasenk@redhat.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/1437354550-25858-4-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
-rw-r--r--arch/x86/include/asm/processor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index f4e4e3ff753c..35ad5547a417 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -405,7 +405,7 @@ struct thread_struct {
unsigned long error_code;
#ifdef CONFIG_X86_32
/* Virtual 86 mode info */
- struct vm86_struct __user *vm86_info;
+ struct vm86plus_struct __user *vm86_info;
unsigned long screen_bitmap;
unsigned long v86flags;
unsigned long v86mask;