diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-11 09:24:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-11 09:24:03 -0800 |
| commit | 5be07b3fb53d14581f470745d129141b97d15614 (patch) | |
| tree | 8f090382bbd3d67c0df7c5c9bdf18e2d97d30e34 /include | |
| parent | 91c77a6ec4e207085b9d4c27e6710f349d43195d (diff) | |
| parent | e70af8d040d2b7904dca93d942ba23fb722e21b1 (diff) | |
| download | linux-stable-5be07b3fb53d14581f470745d129141b97d15614.tar.gz linux-stable-5be07b3fb53d14581f470745d129141b97d15614.tar.bz2 linux-stable-5be07b3fb53d14581f470745d129141b97d15614.zip | |
Merge tag 'hyperv-fixes-signed-20221110' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull hyperv fixes from Wei Liu:
- Fix TSC MSR write for root partition (Anirudh Rayabharam)
- Fix definition of vector in pci-hyperv driver (Dexuan Cui)
- A few other misc patches
* tag 'hyperv-fixes-signed-20221110' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
PCI: hv: Fix the definition of vector in hv_compose_msi_msg()
MAINTAINERS: remove sthemmin
x86/hyperv: fix invalid writes to MSRs during root partition kexec
clocksource/drivers/hyperv: add data structure for reference TSC MSR
Drivers: hv: fix repeated words in comments
x86/hyperv: Remove BUG_ON() for kmap_local_page()
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/hyperv-tlfs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index fdce7a4cfc6f..b17c6eeb9afa 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -102,6 +102,15 @@ struct ms_hyperv_tsc_page { volatile s64 tsc_offset; } __packed; +union hv_reference_tsc_msr { + u64 as_uint64; + struct { + u64 enable:1; + u64 reserved:11; + u64 pfn:52; + } __packed; +}; + /* * The guest OS needs to register the guest ID with the hypervisor. * The guest ID is a 64 bit entity and the structure of this ID is |