patch-2.2.16 linux/arch/alpha/kernel/sys_nautilus.c

• Lines: 37
• Date: Wed Jun 7 14:26:42 2000
• Orig file: v2.2.15/linux/arch/alpha/kernel/sys_nautilus.c
• Orig date: Wed May 3 17:16:30 2000

diff -urN v2.2.15/linux/arch/alpha/kernel/sys_nautilus.c linux/arch/alpha/kernel/sys_nautilus.c
@@ -94,7 +94,7 @@
 	{
 		unsigned char control;
 
-		cli();
+		__cli();
 
 		/* Reset periodic interrupt frequency.  */
 		CMOS_WRITE(0x26, RTC_FREQ_SELECT);
@@ -105,7 +105,7 @@
 		CMOS_WRITE(control, RTC_CONTROL);	
 		CMOS_READ(RTC_INTR_FLAGS);
 
-		sti();
+		__sti();
 	}
 #endif
 
@@ -115,7 +115,7 @@
 		break;
 	case LINUX_REBOOT_CMD_RESTART:
 		{
-			int v;
+			unsigned char v;
 			irongate_hose_read_config_byte(0, 0x07<<3, 0x43, &v, 0);
 			irongate_hose_write_config_byte(0, 0x07<<3, 0x43, v | 0x80, 0);
 			outb(1, 0x92);
@@ -504,7 +504,8 @@
 	break;
     }
 
-    printk(KERN_CRIT "> NAUTILUS Machine check 0x%x [%s]\n", vector, mchk_class);
+    printk(KERN_CRIT "> NAUTILUS Machine check 0x%lx [%s]\n",
+	   vector, mchk_class);
 
     if ( cpu_analysis )	
 	ev6_cpu_machine_check(  vector,