patch-2.2.17 linux/arch/alpha/kernel/sys_mikasa.c

• Lines: 56
• Date: Mon Sep 4 18:39:16 2000
• Orig file: v2.2.16/arch/alpha/kernel/sys_mikasa.c
• Orig date: Mon Sep 4 18:37:42 2000

diff -u --recursive --new-file v2.2.16/arch/alpha/kernel/sys_mikasa.c linux/arch/alpha/kernel/sys_mikasa.c
@@ -151,8 +151,9 @@
 	common_pci_fixup(mikasa_map_irq, common_swizzle);
 }
 
+#if defined(CONFIG_ALPHA_GENERIC) || !defined(CONFIG_ALPHA_PRIMO)
 static void
-mikasa_machine_check(unsigned long vector, unsigned long la_ptr,
+mikasa_apecs_machine_check(unsigned long vector, unsigned long la_ptr,
 		     struct pt_regs * regs)
 {
 #define MCHK_NO_DEVSEL 0x205U
@@ -175,14 +176,14 @@
 		(la_ptr + mchk_header->sys_offset);
 
 #ifdef DEBUG
-	printk("mikasa_machine_check: vector=0x%lx la_ptr=0x%lx\n",
+	printk("mikasa_apecs_machine_check: vector=0x%lx la_ptr=0x%lx\n",
 	       vector, la_ptr);
 	printk("        pc=0x%lx size=0x%x procoffset=0x%x sysoffset 0x%x\n",
 	       regs->pc, mchk_header->size, mchk_header->proc_offset,
 	       mchk_header->sys_offset);
-	printk("mikasa_machine_check: expected %d DCSR 0x%lx PEAR 0x%lx\n",
-	       apecs_mcheck_expected, mchk_sysdata->epic_dcsr,
-	       mchk_sysdata->epic_pear);
+	printk("mikasa_apecs_machine_check: expected %d DCSR 0x%lx"
+	       " PEAR 0x%lx\n", apecs_mcheck_expected,
+	       mchk_sysdata->epic_dcsr, mchk_sysdata->epic_pear);
 	ptr = (unsigned long *)la_ptr;
 	for (i = 0; i < mchk_header->size / sizeof(long); i += 2) {
 		printk(" +%lx %lx %lx\n", i*sizeof(long), ptr[i], ptr[i+1]);
@@ -213,7 +214,7 @@
 		wrmces(0x1f);
 		mb();
 		draina();
-		printk("mikasa_machine_check: HW correctable (0x%lx)\n",
+		printk("mikasa_apecs_machine_check: HW correctable (0x%lx)\n",
 		       vector);
 	}
 	else {
@@ -239,6 +240,7 @@
 #endif
 	}
 }
+#endif
 
 
 /*
@@ -252,7 +254,7 @@
 	DO_DEFAULT_RTC,
 	DO_APECS_IO,
 	DO_APECS_BUS,
-	machine_check:		mikasa_machine_check,
+	machine_check:		mikasa_apecs_machine_check,
 	max_dma_address:	ALPHA_MAX_DMA_ADDRESS,
 
 	nr_irqs:		32,