Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdde86ac authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] swpsuspend: Have suspend to disk use factors of sys_reboot 



The suspend to disk code was a poor copy of the code in
sys_reboot now that we have kernel_power_off, kernel_restart
and kernel_halt use them instead of poorly duplicating them inline.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 804ebf46

kernel/power/disk.c

+3 −6
Original line number Diff line number Diff line
@@ -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");