summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-08-24 14:18:53 +1000
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-24 09:41:35 -0700
commit5477d30e841e0f707fd2daddc8cb6949858476ee (patch)
tree4db7781ff7d24c5de92d13636438d76304d4018c
parent3725822f7c7134249addcd4549aff086950c8090 (diff)
downloadblackbird-op-linux-5477d30e841e0f707fd2daddc8cb6949858476ee.tar.gz
blackbird-op-linux-5477d30e841e0f707fd2daddc8cb6949858476ee.zip
[PATCH] ppc64: Export machine_power_off for therm_pm72 module
This patch puts back the export of machine_power_off() that was removed by some janitor as it's used for emergency shutdown by the G5 thermal control driver. Wether that driver should use kernel_power_off() instead is debatable and a post-2.6.13 decision. In the meantime, please commit that patch that fixes the driver for now. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc64/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index 687e85595208..e9c24d2dbd91 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -706,6 +706,8 @@ void machine_power_off(void)
local_irq_disable();
while (1) ;
}
+/* Used by the G5 thermal driver */
+EXPORT_SYMBOL_GPL(machine_power_off);
void machine_halt(void)
{
OpenPOWER on IntegriCloud