X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2Fkernel%2Fsmp-tbsync.c;h=6a5694fcc711efefdc063e9b53d905b82a091dab;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=d0cf3f86931dbffae1aa6c0b182722be1376b089;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/arch/ppc/kernel/smp-tbsync.c b/arch/ppc/kernel/smp-tbsync.c
index d0cf3f869..6a5694fcc 100644
--- a/arch/ppc/kernel/smp-tbsync.c
+++ b/arch/ppc/kernel/smp-tbsync.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
@@ -47,9 +48,8 @@ void __devinit
 smp_generic_take_timebase( void )
 {
 	int cmd, tbl, tbu;
-	unsigned long flags;
 
-	local_irq_save(flags);
+	local_irq_disable();
 	while( !running )
 		;
 	rmb();
@@ -65,7 +65,7 @@ smp_generic_take_timebase( void )
 		tbu = tbsync->tbu;
 		tbsync->ack = 0;
 		if( cmd == kExit )
-			break;
+			return;
 
 		if( cmd == kSetAndTest ) {
 			while( tbsync->handshake )
@@ -78,7 +78,7 @@ smp_generic_take_timebase( void )
 		}
 		enter_contest( tbsync->mark, -1 );
 	}
-	local_irq_restore(flags);
+	local_irq_enable();
 }
 
 static int __devinit