On Sat 2013-10-26 22:31:11, Jonghwan Choi wrote:
> From: Russ Dill <Russ.Dill@xxxxxx>
>
> This patch looks like it should be in the 3.11-stable tree, should we apply
> it?
I don't think problem it fixes is serious enough to warrant -stable
inclusion.
>
> ------------------
>
> From: "Russ Dill <Russ.Dill@xxxxxx>"
>
> commit d3c345dbc7c083414ef74eb22ff26ba2bd100759 upstream
>
> 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@xxxxxx>
> Acked-by: Pavel Machek <Pavel@xxxxxx>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> Signed-off-by: Jonghwan Choi <jhbird.choi@xxxxxxxxxxx>
> ---
> kernel/power/hibernate.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index b26f5f1..3da09f1 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -845,7 +845,7 @@ close_finish:
> goto Finish;
> }
>
> -late_initcall(software_resume);
> +late_initcall_sync(software_resume);
>
>
> static const char * const hibernation_modes[] = {
> --
> 1.8.1.2
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html