patch-2.1.124 linux/arch/i386/kernel/smp.c

Next file: linux/arch/i386/kernel/traps.c
Previous file: linux/arch/i386/kernel/signal.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.123/linux/arch/i386/kernel/smp.c linux/arch/i386/kernel/smp.c
@@ -736,6 +736,7 @@
 	/*  Must be done before calibration delay is computed  */
 	mtrr_init_secondary_cpu ();
 #endif
+	stts();
 	smp_callin();
 	while (!smp_commenced)
 		barrier();
@@ -1751,8 +1752,8 @@
 
 	static volatile int calibration_lock;
 
-	save_flags(flags);
-	cli();
+	__save_flags(flags);
+	__cli();
 
 	SMP_PRINTK(("setup_APIC_clock() called.\n"));
 
@@ -1790,8 +1791,7 @@
 
 	ack_APIC_irq ();
 
-
-	restore_flags(flags);
+	__restore_flags(flags);
 }
 
 /*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov