summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-11 20:28:58 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-11 20:28:58 +0100
commitf1ee3e150bd9da2dd60a210926c86cffd4a336ea (patch)
tree52e02b4dac2906aafc2d1b487fd13326a22216a1 /drivers
parentLinux 5.11-rc3 (diff)
parentx86/hyperv: check cpu mask after interrupt has been disabled (diff)
downloadlinux-f1ee3e150bd9da2dd60a210926c86cffd4a336ea.tar.xz
linux-f1ee3e150bd9da2dd60a210926c86cffd4a336ea.zip
Merge tag 'hyperv-fixes-signed-20210111' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull hyperv fixes from Wei Liu: - fix kexec panic/hang (Dexuan Cui) - fix occasional crashes when flushing TLB (Wei Liu) * tag 'hyperv-fixes-signed-20210111' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux: x86/hyperv: check cpu mask after interrupt has been disabled x86/hyperv: Fix kexec panic/hang issues
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hv/vmbus_drv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 502f8cd95f6d..d491fdcee61f 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -2550,7 +2550,6 @@ static void hv_kexec_handler(void)
/* Make sure conn_state is set as hv_synic_cleanup checks for it */
mb();
cpuhp_remove_state(hyperv_cpuhp_online);
- hyperv_cleanup();
};
static void hv_crash_handler(struct pt_regs *regs)
@@ -2566,7 +2565,6 @@ static void hv_crash_handler(struct pt_regs *regs)
cpu = smp_processor_id();
hv_stimer_cleanup(cpu);
hv_synic_disable_regs(cpu);
- hyperv_cleanup();
};
static int hv_synic_suspend(void)