hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/x86/kernel/crash.c
....@@ -37,7 +37,6 @@
3737 #include <linux/kdebug.h>
3838 #include <asm/cpu.h>
3939 #include <asm/reboot.h>
40
-#include <asm/virtext.h>
4140 #include <asm/intel_pt.h>
4241 #include <asm/crash.h>
4342 #include <asm/cmdline.h>
....@@ -93,15 +92,6 @@
9392 * VMCLEAR VMCSs loaded on all cpus if needed.
9493 */
9594 cpu_crash_vmclear_loaded_vmcss();
96
-
97
- /* Disable VMX or SVM if needed.
98
- *
99
- * We need to disable virtualization on all CPUs.
100
- * Having VMX or SVM enabled on any CPU may break rebooting
101
- * after the kdump kernel has finished its task.
102
- */
103
- cpu_emergency_vmxoff();
104
- cpu_emergency_svm_disable();
10595
10696 /*
10797 * Disable Intel PT to stop its logging
....@@ -161,12 +151,7 @@
161151 */
162152 cpu_crash_vmclear_loaded_vmcss();
163153
164
- /* Booting kdump kernel with VMX or SVM enabled won't work,
165
- * because (among other limitations) we can't disable paging
166
- * with the virt flags.
167
- */
168
- cpu_emergency_vmxoff();
169
- cpu_emergency_svm_disable();
154
+ cpu_emergency_disable_virtualization();
170155
171156 /*
172157 * Disable Intel PT to stop its logging