patch-2.1.9 linux/arch/sparc/kernel/tadpole.c

• Lines: 18
• Date: Sat Nov 9 10:11:50 1996
• Orig file: v2.1.8/linux/arch/sparc/kernel/tadpole.c
• Orig date: Mon Apr 22 10:59:39 1996

diff -u --recursive --new-file v2.1.8/linux/arch/sparc/kernel/tadpole.c linux/arch/sparc/kernel/tadpole.c
@@ -61,7 +61,7 @@
 	if (!clk_ctrl)
 		return;
 	if (!(clk_state & CLOCK_INIT_DONE)) {
-		save_flags(flags); cli();
+		save_and_cli(flags);
 		clk_init();
 		clk_state |= CLOCK_INIT_DONE;       /* all done */
 		restore_flags(flags);
@@ -70,7 +70,7 @@
 	if (!(clk_ctrl[2] & 1))
 		return;               /* no speed up yet */
 
-	save_flags(flags); cli();
+	save_and_cli(flags);
 
 	/* if SCSI DMA in progress, don't slow clock */
 	mcsr = ldphys(MACIO_SCSI_CSR_ADDR);