patch-2.4.22 linux-2.4.22/include/asm-arm/arch-shark/system.h

Next file: linux-2.4.22/include/asm-arm/arch-shark/time.h
Previous file: linux-2.4.22/include/asm-arm/arch-shark/memory.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/include/asm-arm/arch-shark/system.h linux-2.4.22/include/asm-arm/arch-shark/system.h
@@ -11,7 +11,7 @@
 static void arch_reset(char mode)
 {
 	short temp;
-	cli();
+	local_irq_disable();
 	/* Reset the Machine via pc[3] of the sequoia chipset */
 	outw(0x09,0x24);
 	temp=inw(0x26);
@@ -21,7 +21,7 @@
 
 }
 
-static void arch_idle(void)
+static inline void arch_idle(void)
 {
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)