---

yaml --- r: 5054 b: refs/heads/master c: fdde86a h: refs/heads/master v: v3
git-mirror · Jul 26, 2005 · 9975d62 · 9975d62
1 parent 58e6376
commit 9975d62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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");