diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:39:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 13:40:02 +0100 |
| commit | 40c1fa52cdb7c13ef88232e374b4b8ac8d820c4f (patch) | |
| tree | 9343f6be910d5ccd6195a68ef9f4c251abc7418c /arch/x86/include/uapi/asm/vm86.h | |
| parent | c46f52231e79af025e2c89e889d69ec20a4c024f (diff) | |
| parent | 3228e1dc80983ee1f5d2e533d010b3bd8b50f0e2 (diff) | |
Merge branch 'x86/cleanups' into x86/mm
Merge recent cleanups to the x86 MM code to resolve a conflict.
Conflicts:
arch/x86/mm/fault.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/uapi/asm/vm86.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/vm86.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/uapi/asm/vm86.h b/arch/x86/include/uapi/asm/vm86.h index d2ee4e307ef8..18909b8050bc 100644 --- a/arch/x86/include/uapi/asm/vm86.h +++ b/arch/x86/include/uapi/asm/vm86.h @@ -97,7 +97,7 @@ struct revectored_struct { struct vm86_struct { struct vm86_regs regs; unsigned long flags; - unsigned long screen_bitmap; + unsigned long screen_bitmap; /* unused, preserved by vm86() */ unsigned long cpu_type; struct revectored_struct int_revectored; struct revectored_struct int21_revectored; @@ -106,7 +106,7 @@ struct vm86_struct { /* * flags masks */ -#define VM86_SCREEN_BITMAP 0x0001 +#define VM86_SCREEN_BITMAP 0x0001 /* no longer supported */ struct vm86plus_info_struct { unsigned long force_return_for_pic:1; |