upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / ppc / syslib / m8xx_setup.c

diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c
index 41d16c7..c1db2ab 100644 (file)
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@ -238,7 +238,7 @@ m8xx_restart(char *cmd)
 {
        __volatile__ unsigned char dummy;
 
-       cli();
+       local_irq_disable();
        ((immap_t *)IMAP_ADDR)->im_clkrst.car_plprcr |= 0x00000080;
 
        /* Clear the ME bit in MSR to cause checkstop on machine check