Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / drivers / hv / hv.c

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 75a8638..f202ac7 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -165,7 +165,7 @@ void hv_synic_enable_regs(unsigned int cpu)
        hv_get_simp(simp.as_uint64);
        simp.simp_enabled = 1;
        simp.base_simp_gpa = virt_to_phys(hv_cpu->synic_message_page)
-               >> PAGE_SHIFT;
+               >> HV_HYP_PAGE_SHIFT;
 
        hv_set_simp(simp.as_uint64);
 
@@ -173,14 +173,14 @@ void hv_synic_enable_regs(unsigned int cpu)
        hv_get_siefp(siefp.as_uint64);
        siefp.siefp_enabled = 1;
        siefp.base_siefp_gpa = virt_to_phys(hv_cpu->synic_event_page)
-               >> PAGE_SHIFT;
+               >> HV_HYP_PAGE_SHIFT;
 
        hv_set_siefp(siefp.as_uint64);
 
        /* Setup the shared SINT. */
        hv_get_synint_state(VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
 
-       shared_sint.vector = HYPERVISOR_CALLBACK_VECTOR;
+       shared_sint.vector = hv_get_vector();
        shared_sint.masked = false;
        shared_sint.auto_eoi = hv_recommend_using_aeoi();
        hv_set_synint_state(VMBUS_MESSAGE_SINT, shared_sint.as_uint64);