diff --git a/[refs] b/[refs] index e4ad0fe19139..e12bd5306a17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ede890c2c069d611ece0e184103a6b9236ce416a +refs/heads/master: bcb5ba8b4e8a5ae14b27351bdf499dd4c3bcc944 diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c index 62b0bc6e4983..0a28d4db3597 100644 --- a/trunk/kernel/power/main.c +++ b/trunk/kernel/power/main.c @@ -308,7 +308,7 @@ EXPORT_SYMBOL_GPL(pm_wq); static int __init pm_start_workqueue(void) { - pm_wq = create_freezeable_workqueue("pm"); + pm_wq = alloc_workqueue("pm", WQ_FREEZEABLE, 0); return pm_wq ? 0 : -ENOMEM; }