Skip to content

Commit c3a6ae7

Browse files
mrathor99liuw
authored andcommitted
x86/hyperv: Move hv crash init after hypercall pg setup
hv_root_crash_init() is not setting up the hypervisor crash collection for baremetal cases because when it's called, hypervisor page is not setup. Fix is simple, just move the crash init call after the hypercall page setup. Signed-off-by: Mukesh Rathor <[email protected]> Signed-off-by: Wei Liu <[email protected]>
1 parent 93f039f commit c3a6ae7

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

arch/x86/hyperv/hv_init.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,6 @@ void __init hyperv_init(void)
558558
memunmap(src);
559559

560560
hv_remap_tsc_clocksource();
561-
hv_root_crash_init();
562561
hv_sleep_notifiers_register();
563562
} else {
564563
hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
@@ -567,6 +566,9 @@ void __init hyperv_init(void)
567566

568567
hv_set_hypercall_pg(hv_hypercall_pg);
569568

569+
if (hv_root_partition()) /* after set hypercall pg */
570+
hv_root_crash_init();
571+
570572
skip_hypercall_pg_init:
571573
/*
572574
* hyperv_init() is called before LAPIC is initialized: see

0 commit comments

Comments
 (0)