From 420f77c6d83b2e092a22f86b8781722dc5440202 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 17 Jan 2006 21:14:01 +0000
Subject: [PATCH] --- yaml --- r: 19887 b: refs/heads/master c:
 9414d3628abb646834965b6c23b8e9064729b110 h: refs/heads/master i:   19885:
 f53b95b13099b61ee40dae499857e2637cf72c5f   19883:
 c080ebabaffbdddc9efd97a3180ebcc358f0d0c1   19879:
 ea0115e01f8bc9f2f6e1c7679912504707d825bf   19871:
 3b2f7e07ffedb12dc59959b7217496c3c73d22e7 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/mips/kernel/reset.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ad73c5180db1..92126f3635ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3305a8835ed039363822523a3cac24e990083dc
+refs/heads/master: 9414d3628abb646834965b6c23b8e9064729b110
diff --git a/trunk/arch/mips/kernel/reset.c b/trunk/arch/mips/kernel/reset.c
index ae2ba67b7ef6..a131aa0cbe66 100644
--- a/trunk/arch/mips/kernel/reset.c
+++ b/trunk/arch/mips/kernel/reset.c
@@ -23,16 +23,18 @@ void (*_machine_power_off)(void);
 
 void machine_restart(char *command)
 {
-	_machine_restart(command);
+	if (_machine_restart)
+		_machine_restart(command);
 }
 
 void machine_halt(void)
 {
-	_machine_halt();
+	if (_machine_halt)
+		_machine_halt();
 }
 
 void machine_power_off(void)
 {
-	_machine_power_off();
+	if (_machine_power_off)
+		_machine_power_off();
 }
-