Commit d3c345db authored Oct 24, 2013 by Russ Dill Committed by Rafael J. Wysocki Oct 25, 2013

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>

parent 7244cb62

kernel/power/hibernate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -846,7 +846,7 @@ static int software_resume(void)
		goto Finish;
		}

		late_initcall(software_resume);
		late_initcall_sync(software_resume);


		static const char * const hibernation_modes[] = {

Admin message