From 9975d62816e96dd3904bb1776b35e5bdd2b40fba Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 26 Jul 2005 12:01:17 -0600
Subject: [PATCH] --- yaml --- r: 5054 b: refs/heads/master c:
 fdde86ac50357b6a811e3574e47d189e81a21444 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/disk.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 48aa2d28f6ae..9a4a2283650e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 804ebf46d51653e736108074473d9493398f2df9
+refs/heads/master: fdde86ac50357b6a811e3574e47d189e81a21444
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 3ec789c6b537..664eb0469b6e 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -59,16 +59,13 @@ static void power_down(suspend_disk_method_t mode)
 		error = pm_ops->enter(PM_SUSPEND_DISK);
 		break;
 	case PM_DISK_SHUTDOWN:
-		printk("Powering off system\n");
-		device_shutdown();
-		machine_power_off();
+		kernel_power_off();
 		break;
 	case PM_DISK_REBOOT:
-		device_shutdown();
-		machine_restart(NULL);
+		kernel_restart(NULL);
 		break;
 	}
-	machine_halt();
+	kernel_halt();
 	/* Valid image is on the disk, if we continue we risk serious data corruption
 	   after resume. */
 	printk(KERN_CRIT "Please power me down manually\n");