.. | .. |
---|
37 | 37 | #include <linux/kdebug.h> |
---|
38 | 38 | #include <asm/cpu.h> |
---|
39 | 39 | #include <asm/reboot.h> |
---|
40 | | -#include <asm/virtext.h> |
---|
41 | 40 | #include <asm/intel_pt.h> |
---|
42 | 41 | #include <asm/crash.h> |
---|
43 | 42 | #include <asm/cmdline.h> |
---|
.. | .. |
---|
93 | 92 | * VMCLEAR VMCSs loaded on all cpus if needed. |
---|
94 | 93 | */ |
---|
95 | 94 | 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(); |
---|
105 | 95 | |
---|
106 | 96 | /* |
---|
107 | 97 | * Disable Intel PT to stop its logging |
---|
.. | .. |
---|
161 | 151 | */ |
---|
162 | 152 | cpu_crash_vmclear_loaded_vmcss(); |
---|
163 | 153 | |
---|
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(); |
---|
170 | 155 | |
---|
171 | 156 | /* |
---|
172 | 157 | * Disable Intel PT to stop its logging |
---|