diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-19 13:03:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-19 13:03:06 +0300 |
| commit | 89771319e0f11314fcf6d22fcdd0c41e2d157ddc (patch) | |
| tree | db7d5bddaa727f844aab9001f171fdaa214267f4 /arch/x86/hyperv | |
| parent | 6d536cad0d55e71442b6d65500f74eb85544269e (diff) | |
| parent | 4701f33a10702d5fc577c32434eb62adde0a1ae1 (diff) | |
| download | linux-89771319e0f11314fcf6d22fcdd0c41e2d157ddc.tar.xz | |
Merge tag 'v6.14-rc7' into x86/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/hyperv')
| -rw-r--r-- | arch/x86/hyperv/hv_vtl.c | 1 | ||||
| -rw-r--r-- | arch/x86/hyperv/ivm.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/hyperv/hv_vtl.c b/arch/x86/hyperv/hv_vtl.c index 4e1b1e3b5658..3f4e20d7b724 100644 --- a/arch/x86/hyperv/hv_vtl.c +++ b/arch/x86/hyperv/hv_vtl.c @@ -30,6 +30,7 @@ void __init hv_vtl_init_platform(void) x86_platform.realmode_init = x86_init_noop; x86_init.irqs.pre_vector_init = x86_init_noop; x86_init.timers.timer_init = x86_init_noop; + x86_init.resources.probe_roms = x86_init_noop; /* Avoid searching for BIOS MP tables */ x86_init.mpparse.find_mptable = x86_init_noop; diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c index dd68d9ad9b22..ec7880271cf9 100644 --- a/arch/x86/hyperv/ivm.c +++ b/arch/x86/hyperv/ivm.c @@ -464,7 +464,6 @@ static int hv_mark_gpa_visibility(u16 count, const u64 pfn[], enum hv_mem_host_visibility visibility) { struct hv_gpa_range_for_visibility *input; - u16 pages_processed; u64 hv_status; unsigned long flags; @@ -493,7 +492,7 @@ static int hv_mark_gpa_visibility(u16 count, const u64 pfn[], memcpy((void *)input->gpa_page_list, pfn, count * sizeof(*pfn)); hv_status = hv_do_rep_hypercall( HVCALL_MODIFY_SPARSE_GPA_PAGE_HOST_VISIBILITY, count, - 0, input, &pages_processed); + 0, input, NULL); local_irq_restore(flags); if (hv_result_success(hv_status)) |