diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:25:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:25:26 +0100 |
| commit | ea2301b6220117398a1de4f4bc853fbe886d5e08 (patch) | |
| tree | 8823c3becd0b4fd3db9706892845cd02f760627a /arch/x86/include | |
| parent | 0803e6051c1562e1525c3e044313390bf8b35c2b (diff) | |
| parent | 99fec39e7725d091c94d1bb0242e40c8092994f6 (diff) | |
| download | op-kernel-dev-ea2301b6220117398a1de4f4bc853fbe886d5e08.zip op-kernel-dev-ea2301b6220117398a1de4f4bc853fbe886d5e08.tar.gz | |
Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/vmx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 8b67807..5db8b0b 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -352,6 +352,7 @@ enum vmcs_field { #define INTR_TYPE_NMI_INTR (2 << 8) /* NMI */ #define INTR_TYPE_HARD_EXCEPTION (3 << 8) /* processor exception */ #define INTR_TYPE_SOFT_INTR (4 << 8) /* software interrupt */ +#define INTR_TYPE_PRIV_SW_EXCEPTION (5 << 8) /* ICE breakpoint - undocumented */ #define INTR_TYPE_SOFT_EXCEPTION (6 << 8) /* software exception */ /* GUEST_INTERRUPTIBILITY_INFO flags. */ |
