Merge tag 'secureexec-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / m68k / mac / misc.c

diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 8aa8792e3174c488bc413421efa87449b44635a0..d96348a52362ba74c98386f7fb0d2ab59b5efb7b 100644 (file)
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -357,6 +357,17 @@ static void cuda_shutdown(void)
        struct adb_request req;
        if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN) < 0)
                return;
+
+       /* Avoid infinite polling loop when PSU is not under Cuda control */
+       switch (macintosh_config->ident) {
+       case MAC_MODEL_C660:
+       case MAC_MODEL_Q605:
+       case MAC_MODEL_Q605_ACC:
+       case MAC_MODEL_P475:
+       case MAC_MODEL_P475F:
+               return;
+       }
+
        while (!req.complete)
                cuda_poll();
 }
@@ -463,8 +474,9 @@ void mac_poweroff(void)
                pmu_shutdown();
 #endif
        }
-       local_irq_enable();
+
        pr_crit("It is now safe to turn off your Macintosh.\n");
+       local_irq_disable();
        while(1);
 }
 
@@ -554,8 +566,8 @@ void mac_reset(void)
        }
 
        /* should never get here */
-       local_irq_enable();
        pr_crit("Restart failed. Please restart manually.\n");
+       local_irq_disable();
        while(1);
 }