---

yaml --- r: 9215 b: refs/heads/master c: 88d10bb h: refs/heads/master i: 9213: 44d4efc 9211: 28145d3 9207: 97842b0 9199: 9e649de 9183: 2521a9e 9151: 8640aa5 9087: 671a5c0 8959: 854e93c 8703: c1fcf53 8191: 08f97ba v: v3
git-mirror · Sep 23, 2005 · a1ace4a · a1ace4a
1 parent a45ff90
commit a1ace4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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: