summaryrefslogtreecommitdiff
path: root/arch/m68k/mac
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2017-08-12 17:12:12 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2017-08-21 11:52:56 +0200
commit558d5ad276c9b2ffbe706e78310a777f87e65c5f (patch)
treeabceaed0ddde7889399f81f8bf84651e7840e9f5 /arch/m68k/mac
parent41e93a3087296b14e8f671010420bd29d07c989f (diff)
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>
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r--arch/m68k/mac/misc.c5
1 files changed, 3 insertions, 2 deletions
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);
}