---

yaml --- r: 63006 b: refs/heads/master c: 58b3b71 h: refs/heads/master v: v3
git-mirror · Jul 26, 2007 · 973a78f · 973a78f
1 parent ff375b5
commit 973a78f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 602033ed5907a59ce86f709082a35be047743a86
+refs/heads/master: 58b3b71dfaaecbf7cff1fe10c049d663f0313e5f
diff --git a/trunk/drivers/base/power/shutdown.c b/trunk/drivers/base/power/shutdown.c
@@ -44,7 +44,5 @@ void device_shutdown(void)
 			dev->driver->shutdown(dev);
 		}
 	}
-
-	sysdev_shutdown();
 }
 
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
@@ -551,6 +551,9 @@ extern void put_device(struct device * dev);
 /* drivers/base/power/shutdown.c */
 extern void device_shutdown(void);
 
+/* drivers/base/sys.c */
+extern void sysdev_shutdown(void);
+
 
 /* drivers/base/firmware.c */
 extern int __must_check firmware_register(struct kset *);

diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
@@ -216,6 +216,7 @@ int hibernation_platform_enter(void)
 		 * sleep state after all
 		 */
 		error = hibernation_ops->prepare();
+		sysdev_shutdown();
 		if (!error)
 			error = hibernation_ops->enter();
 	} else {

diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
@@ -804,6 +804,7 @@ static void kernel_restart_prepare(char *cmd)
 	blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
 	system_state = SYSTEM_RESTART;
 	device_shutdown();
+	sysdev_shutdown();
 }
 
 /**
@@ -860,6 +861,7 @@ void kernel_shutdown_prepare(enum system_states state)
 void kernel_halt(void)
 {
 	kernel_shutdown_prepare(SYSTEM_HALT);
+	sysdev_shutdown();
 	printk(KERN_EMERG "System halted.\n");
 	machine_halt();
 }
@@ -876,6 +878,7 @@ void kernel_power_off(void)
 	kernel_shutdown_prepare(SYSTEM_POWER_OFF);
 	if (pm_power_off_prepare)
 		pm_power_off_prepare();
+	sysdev_shutdown();
 	printk(KERN_EMERG "Power down.\n");
 	machine_power_off();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,5 @@ void device_shutdown(void) @@
     			dev->driver->shutdown(dev);
     		}
     	}
-    	sysdev_shutdown();
     }