diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-27 13:28:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-27 13:28:27 -0700 |
commit | 869997be0e3d4b994aa04bfdf3e534b9072e6a17 (patch) | |
tree | 34753683f3fe8157d00a84d72b9df0298cfa6f31 /arch/x86/include | |
parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
parent | f081bbb3fd03f949bcdc5aed95a827d7c65e0f30 (diff) | |
download | linux-869997be0e3d4b994aa04bfdf3e534b9072e6a17.tar.gz linux-869997be0e3d4b994aa04bfdf3e534b9072e6a17.tar.bz2 linux-869997be0e3d4b994aa04bfdf3e534b9072e6a17.zip |
Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull Hyper-V fixes from Wei Liu:
- Two patches from Dexuan fixing suspension bugs
- Three cleanup patches from Andy and Michael
* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
hyper-v: Remove internal types from UAPI header
hyper-v: Use UUID API for exporting the GUID
x86/hyperv: Suspend/resume the VP assist page for hibernation
Drivers: hv: Move AEOI determination to architecture dependent code
Drivers: hv: vmbus: Fix Suspend-to-Idle for Generation-2 VM
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/mshyperv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 1c42ecbe75cb..d30805ed323e 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -35,6 +35,8 @@ typedef int (*hyperv_fill_flush_list_func)( rdmsrl(HV_X64_MSR_SINT0 + int_num, val) #define hv_set_synint_state(int_num, val) \ wrmsrl(HV_X64_MSR_SINT0 + int_num, val) +#define hv_recommend_using_aeoi() \ + (!(ms_hyperv.hints & HV_DEPRECATING_AEOI_RECOMMENDED)) #define hv_get_crash_ctl(val) \ rdmsrl(HV_X64_MSR_CRASH_CTL, val) |