summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2015-07-29 07:41:23 +0200
committerIngo Molnar <mingo@kernel.org>2015-07-31 13:31:11 +0200
commitdecd275e62d5eef4b947fab89652fa6afdadf2f2 (patch)
treef263be7aa73eaf10b0f1f26c1589303207b49d15 /arch/x86/include
parentx86/vm86: Rename vm86->vm86_info to user_vm86 (diff)
downloadlinux-decd275e62d5eef4b947fab89652fa6afdadf2f2.tar.xz
linux-decd275e62d5eef4b947fab89652fa6afdadf2f2.zip
x86/vm86: Rename vm86->v86flags and v86mask
Rename v86flags to veflags, and v86mask to veflags_mask. 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-9-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/vm86.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/vm86.h b/arch/x86/include/asm/vm86.h
index c93ae7379550..1e491f3af317 100644
--- a/arch/x86/include/asm/vm86.h
+++ b/arch/x86/include/asm/vm86.h
@@ -30,8 +30,8 @@ struct kernel_vm86_regs {
struct vm86 {
struct vm86plus_struct __user *user_vm86;
struct pt_regs regs32;
- unsigned long v86flags;
- unsigned long v86mask;
+ unsigned long veflags;
+ unsigned long veflags_mask;
unsigned long saved_sp0;
unsigned long flags;