mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
[PATCH] swsusp: disable nonboot CPUs before entering platform suspend
Prevent the WARN_ON() in arch/x86_64/kernel/acpi/sleep.c:init_low_mapping() from triggering by disabling nonboot CPUs before we finally enter the platform suspend. Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Pavel Machek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
886c595295
commit
94985134b7
2 changed files with 3 additions and 1 deletions
|
|
@ -58,6 +58,7 @@ static inline int platform_prepare(void)
|
|||
|
||||
static void power_down(suspend_disk_method_t mode)
|
||||
{
|
||||
disable_nonboot_cpus();
|
||||
switch(mode) {
|
||||
case PM_DISK_PLATFORM:
|
||||
if (pm_ops && pm_ops->enter) {
|
||||
|
|
|
|||
|
|
@ -398,9 +398,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp,
|
|||
|
||||
case PMOPS_ENTER:
|
||||
if (data->platform_suspend) {
|
||||
disable_nonboot_cpus();
|
||||
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
|
||||
error = pm_ops->enter(PM_SUSPEND_DISK);
|
||||
error = 0;
|
||||
enable_nonboot_cpus();
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue