diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-19 08:15:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-19 08:15:30 +0200 |
| commit | 1d7bb2bf7ad8c95cd50e97a83461610385b5259d (patch) | |
| tree | 047b42c16ded5ea12cad3ef7f0296f752b7e07c7 /arch | |
| parent | Merge tag 'powerpc-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
| parent | tools/hv: Add memory allocation check in hv_fcopy_start (diff) | |
| download | linux-1d7bb2bf7ad8c95cd50e97a83461610385b5259d.tar.xz linux-1d7bb2bf7ad8c95cd50e97a83461610385b5259d.zip | |
Merge tag 'hyperv-next-signed-20240916' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull Hyper-V updates from Wei Liu:
- Optimize boot time by concurrent execution of hv_synic_init()
(Saurabh Sengar)
- Use helpers to read control registers in hv_snp_boot_ap() (Yosry
Ahmed)
- Add memory allocation check in hv_fcopy_start (Zhu Jun)
* tag 'hyperv-next-signed-20240916' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
tools/hv: Add memory allocation check in hv_fcopy_start
x86/hyperv: use helpers to read control registers in hv_snp_boot_ap()
Drivers: hv: vmbus: Optimize boot time by concurrent execution of hv_synic_init()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/hyperv/ivm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c index b4a851d27c7c..60fc3ed72830 100644 --- a/arch/x86/hyperv/ivm.c +++ b/arch/x86/hyperv/ivm.c @@ -321,9 +321,9 @@ int hv_snp_boot_ap(u32 cpu, unsigned long start_ip) vmsa->efer = native_read_msr(MSR_EFER); - asm volatile("movq %%cr4, %%rax;" : "=a" (vmsa->cr4)); - asm volatile("movq %%cr3, %%rax;" : "=a" (vmsa->cr3)); - asm volatile("movq %%cr0, %%rax;" : "=a" (vmsa->cr0)); + vmsa->cr4 = native_read_cr4(); + vmsa->cr3 = __native_read_cr3(); + vmsa->cr0 = native_read_cr0(); vmsa->xcr0 = 1; vmsa->g_pat = HV_AP_INIT_GPAT_DEFAULT; |