patch-pre2.0.12 linux/arch/alpha/kernel/apecs.c

Next file: linux/arch/alpha/kernel/bios32.c
Previous file: linux/arch/alpha/kernel/alcor.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.11/linux/arch/alpha/kernel/apecs.c linux/arch/alpha/kernel/apecs.c
@@ -519,7 +519,13 @@
 	 * Check if machine check is due to a badaddr() and if so,
 	 * ignore the machine check.
 	 */
+#ifdef CONFIG_ALPHA_MIKASA
+	/* for now on MIKASA, if it was expected, ignore it */
+	/* we need the details of the mcheck frame to really know... */
+	if (apecs_mcheck_expected) {
+#else
 	if (apecs_mcheck_expected && (mchk_sysdata->epic_dcsr && 0x0c00UL)) {
+#endif
 		apecs_mcheck_expected = 0;
 		apecs_mcheck_taken = 1;
 		mb();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this