Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[mirror_ubuntu-bionic-kernel.git] / drivers / hv / hv.c

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 665a64f1611e31fe3650f6d030aa373ca1301c03..12e7baecb84ef4ac2becfd29040421a891e06f98 100644 (file)
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -254,7 +254,10 @@ int hv_synic_init(unsigned int cpu)
        shared_sint.as_uint64 = 0;
        shared_sint.vector = HYPERVISOR_CALLBACK_VECTOR;
        shared_sint.masked = false;
-       shared_sint.auto_eoi = true;
+       if (ms_hyperv.hints & HV_X64_DEPRECATING_AEOI_RECOMMENDED)
+               shared_sint.auto_eoi = false;
+       else
+               shared_sint.auto_eoi = true;
 
        hv_set_synint_state(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT,
                            shared_sint.as_uint64);