diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-13 11:56:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-13 11:56:16 -0700 |
| commit | b5df1b3a5637deae352d282b50d4b99d0e2b8d1d (patch) | |
| tree | 5b057e8ac631898ccb52c7e21ab04f6456af3e78 /arch/x86/include/uapi/asm/hyperv.h | |
| parent | 9888e4d4831d72a64c4378878ada1a4d7539a790 (diff) | |
| parent | 1278f58cdee63cfbb04e5624474a291c81a7a13b (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"The main changes are the PCID fixes from Andy, but there's also two
hyperv fixes and two paravirt updates"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/hyper-v: Remove duplicated HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED definition
x86/hyper-V: Allocate the IDT entry early in boot
paravirt: Switch maintainer
x86/paravirt: Remove no longer used paravirt functions
x86/mm/64: Initialize CR4.PCIDE early
x86/hibernate/64: Mask off CR3's PCID bits in the saved CR3
x86/mm: Get rid of VM_BUG_ON in switch_tlb_irqs_off()
Diffstat (limited to 'arch/x86/include/uapi/asm/hyperv.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/hyperv.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 7032f4d8dff3..f65d12504e80 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -153,12 +153,6 @@ #define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) /* - * HV_VP_SET available - */ -#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11) - - -/* * Crash notification flag. */ #define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63) |