From: Finn Thain <fthain@telegraphics.com.au>
Date: Sat, 12 Aug 2017 07:12:12 +0000 (+1000)
Subject: m68k/mac: Avoid soft-lockup warning after mach_power_off
X-Git-Tag: v4.14-rc1~155^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=558d5ad276c9b2ffbe706e78310a777f87e65c5f;p=linux.git

m68k/mac: Avoid soft-lockup warning after mach_power_off

Disable interrupts for power-off, like other platforms do. This prevents
meaningless warnings from the soft-lockup detector on models with a power
supply unit not under software control.

Reported-by: Stan Johnson <userm57@yahoo.com>
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---

diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 944795fd2c7a..d96348a52362 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -474,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);
 }
 
@@ -565,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);
 }