Merge tag 'hardening-v6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-2.6-block.git] / arch / x86 / kernel / cpu / mshyperv.c

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 01fa06dd06b66c9324c670e4847c0d503dbd5691..45e0e70e238cf31a0e51024d0f88505b6a6ce9c4 100644 (file)
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -539,19 +539,18 @@ static void __init ms_hyperv_init_platform(void)
         */
        x86_platform.apic_post_init = hyperv_init;
        hyperv_setup_mmu_ops();
-       /* Setup the IDT for hypervisor callback */
-       alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, asm_sysvec_hyperv_callback);
 
-       /* Setup the IDT for reenlightenment notifications */
+       /* Install system interrupt handler for hypervisor callback */
+       sysvec_install(HYPERVISOR_CALLBACK_VECTOR, sysvec_hyperv_callback);
+
+       /* Install system interrupt handler for reenlightenment notifications */
        if (ms_hyperv.features & HV_ACCESS_REENLIGHTENMENT) {
-               alloc_intr_gate(HYPERV_REENLIGHTENMENT_VECTOR,
-                               asm_sysvec_hyperv_reenlightenment);
+               sysvec_install(HYPERV_REENLIGHTENMENT_VECTOR, sysvec_hyperv_reenlightenment);
        }
 
-       /* Setup the IDT for stimer0 */
+       /* Install system interrupt handler for stimer0 */
        if (ms_hyperv.misc_features & HV_STIMER_DIRECT_MODE_AVAILABLE) {
-               alloc_intr_gate(HYPERV_STIMER0_VECTOR,
-                               asm_sysvec_hyperv_stimer0);
+               sysvec_install(HYPERV_STIMER0_VECTOR, sysvec_hyperv_stimer0);
        }
 
 # ifdef CONFIG_SMP