From a1ace4a95b363b50e5732ed90db4696d619744ba Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 22 Sep 2005 21:43:46 -0700
Subject: [PATCH] --- yaml --- r: 9215 b: refs/heads/master c:
 88d10bbaaec38856f913313b6c0858d9e9b7a066 h: refs/heads/master i:   9213:
 44d4efcc753253834614b028b07432cfa1b0751d   9211:
 28145d32e9316dde4304699b3eff1b9d155cc212   9207:
 97842b05727362971b0e2514cf1cb23dc2f64067   9199:
 9e649de3c417675ce97aebb209d61416aacd2207   9183:
 2521a9efcaffb080486e304072783d7e440a348e   9151:
 8640aa5a950444ecf14bc7bf5cb40620ef185092   9087:
 671a5c08c00efa1afe64172259119c173b3f8030   8959:
 854e93cbd15a658d66538fdadd1657f4d9cdd95f   8703:
 c1fcf537ef35906171bb1e1fc1344bd5220bd83a   8191:
 08f97ba64c3a1c2ff8d3b8828ffa9cf9073395bf v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/disk.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d8b8bc4b3141..5c7d33135866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4c94330e3395ae87451bded2840a25d04f27902
+refs/heads/master: 88d10bbaaec38856f913313b6c0858d9e9b7a066
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 2d8bf054d036..761956e813f5 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -17,12 +17,12 @@
 #include <linux/delay.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
+#include <linux/pm.h>
 
 #include "power.h"
 
 
 extern suspend_disk_method_t pm_disk_mode;
-extern struct pm_ops * pm_ops;
 
 extern int swsusp_suspend(void);
 extern int swsusp_write(void);
@@ -49,13 +49,11 @@ dev_t swsusp_resume_device;
 
 static void power_down(suspend_disk_method_t mode)
 {
-	unsigned long flags;
 	int error = 0;
 
-	local_irq_save(flags);
 	switch(mode) {
 	case PM_DISK_PLATFORM:
- 		device_shutdown();
+		kernel_power_off_prepare();
 		error = pm_ops->enter(PM_SUSPEND_DISK);
 		break;
 	case PM_DISK_SHUTDOWN: