hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM / hibernate: Move software_resume to late_initcall_sync 

software_resume is being called after deferred_probe_initcall in
drivers base. If the probing of the device that contains the resume
image is deferred, and the system has been instructed to wait for
it to show up, this wait will occur in software_resume. This causes
a deadlock.

Move software_resume into late_initcall_sync so that it happens
after all the other late_initcalls.

Signed-off-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Pavel Machek <Pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Russ Dill 2013-10-24 14:25:26 +01:00 committed by Rafael J. Wysocki
parent 7244cb62d9
commit d3c345dbc7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/power/hibernate.c
View File

@ -846,7 +846,7 @@ static int software_resume(void)
goto Finish; goto Finish;
} }
late_initcall(software_resume); late_initcall_sync(software_resume);
static const char * const hibernation_modes[] = { static const char * const hibernation_modes[] = {