|
@@ -626,8 +626,8 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val,
|
|
|
/*
|
|
|
* Look for known traps using IST, and substitute them
|
|
|
* appropriately. The debugger ones are the only ones we care
|
|
|
- * about. Xen will handle faults like double_fault and
|
|
|
- * machine_check, so we should never see them. Warn if
|
|
|
+ * about. Xen will handle faults like double_fault,
|
|
|
+ * so we should never see them. Warn if
|
|
|
* there's an unexpected IST-using fault handler.
|
|
|
*/
|
|
|
if (addr == (unsigned long)debug)
|
|
@@ -642,7 +642,11 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val,
|
|
|
return 0;
|
|
|
#ifdef CONFIG_X86_MCE
|
|
|
} else if (addr == (unsigned long)machine_check) {
|
|
|
- return 0;
|
|
|
+ /*
|
|
|
+ * when xen hypervisor inject vMCE to guest,
|
|
|
+ * use native mce handler to handle it
|
|
|
+ */
|
|
|
+ ;
|
|
|
#endif
|
|
|
} else {
|
|
|
/* Some other trap using IST? */
|