Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"The removal of delayed_work_pending() checks from kernel/power/qos.c
done in 3.9 introduced a deadlock in pm_qos_work_fn().
Fix from Stephen Boyd"
* tag 'pm-3.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / QoS: Fix workqueue deadlock when using pm_qos_update_request_timeout()
+13
-7
+13
-7
kernel/power/qos.c
+13
-7
kernel/power/qos.c
···
296
296
}
297
297
EXPORT_SYMBOL_GPL(pm_qos_request_active);
298
298
299
+
static void __pm_qos_update_request(struct pm_qos_request *req,
300
+
s32 new_value)
301
+
{
302
+
trace_pm_qos_update_request(req->pm_qos_class, new_value);
303
+
304
+
if (new_value != req->node.prio)
305
+
pm_qos_update_target(
306
+
pm_qos_array[req->pm_qos_class]->constraints,
307
+
&req->node, PM_QOS_UPDATE_REQ, new_value);
308
+
}
309
+
299
310
/**
300
311
* pm_qos_work_fn - the timeout handler of pm_qos_update_request_timeout
301
312
* @work: work struct for the delayed work (timeout)
···
319
308
struct pm_qos_request,
320
309
work);
321
310
322
-
pm_qos_update_request(req, PM_QOS_DEFAULT_VALUE);
311
+
__pm_qos_update_request(req, PM_QOS_DEFAULT_VALUE);
323
312
}
324
313
325
314
/**
···
375
364
}
376
365
377
366
cancel_delayed_work_sync(&req->work);
378
-
379
-
trace_pm_qos_update_request(req->pm_qos_class, new_value);
380
-
if (new_value != req->node.prio)
381
-
pm_qos_update_target(
382
-
pm_qos_array[req->pm_qos_class]->constraints,
383
-
&req->node, PM_QOS_UPDATE_REQ, new_value);
367
+
__pm_qos_update_request(req, new_value);
384
368
}
385
369
EXPORT_SYMBOL_GPL(pm_qos_update_request);
386
370