summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2006-01-14 13:21:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 18:27:09 -0800
commit53df751ccd0a404cca169dbd61bae571cc21559a (patch)
tree1dcd6089afe739a4d287613eb5131811dd14a44b
parent0152fb37603e3a776768794030b809ae77027aa4 (diff)
downloadblackbird-op-linux-53df751ccd0a404cca169dbd61bae571cc21559a.tar.gz
blackbird-op-linux-53df751ccd0a404cca169dbd61bae571cc21559a.zip
[PATCH] s390: add dummy pm_power_off
Define a dummy pm_power_off pointer to make sys_reboot happy. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/s390/kernel/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index c08325187a46..de8784267473 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -315,6 +315,11 @@ void machine_power_off(void)
_machine_power_off();
}
+/*
+ * Dummy power off function.
+ */
+void (*pm_power_off)(void) = machine_power_off;
+
static void __init
add_memory_hole(unsigned long start, unsigned long end)
{
OpenPOWER on IntegriCloud