summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2015-07-29 07:41:22 +0200
committerIngo Molnar <mingo@kernel.org>2015-07-31 13:31:11 +0200
commit1342635638cba9b7c8eac776da5e54390d14d313 (patch)
tree75a42b83f4ea946ce6042f81dd09c1a5e9805a32 /arch/x86/include/asm
parentx86/vm86: Clean up vm86.h includes (diff)
downloadlinux-1342635638cba9b7c8eac776da5e54390d14d313.tar.xz
linux-1342635638cba9b7c8eac776da5e54390d14d313.zip
x86/vm86: Rename vm86->vm86_info to user_vm86
Make it clearer that this is the pointer to the userspace vm86 state area. 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-8-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/vm86.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/vm86.h b/arch/x86/include/asm/vm86.h
index b0631965b935..c93ae7379550 100644
--- a/arch/x86/include/asm/vm86.h
+++ b/arch/x86/include/asm/vm86.h
@@ -28,7 +28,7 @@ struct kernel_vm86_regs {
};
struct vm86 {
- struct vm86plus_struct __user *vm86_info;
+ struct vm86plus_struct __user *user_vm86;
struct pt_regs regs32;
unsigned long v86flags;
unsigned long v86mask;