This is a note to let you know that I've just added the patch titled PM / QoS: remove duplicate call to pm_qos_update_target to the 3.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: pm-qos-remove-duplicate-call-to-pm_qos_update_target.patch and it can be found in the queue-3.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From michael.scott@xxxxxxxxxx Wed Mar 11 15:07:47 2015 From: Michael Scott <michael.scott@xxxxxxxxxx> Date: Tue, 10 Mar 2015 13:15:02 -0700 Subject: PM / QoS: remove duplicate call to pm_qos_update_target To: pavel@xxxxxx, rjw@xxxxxxx, gregkh@xxxxxxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx, linux-stable@xxxxxxxxxxxxxxx, linux-pm@xxxxxxxxxxxxxxx, Michael Scott <michael.scott@xxxxxxxxxx> Message-ID: <1426018502-16010-1-git-send-email-michael.scott@xxxxxxxxxx> From: Michael Scott <michael.scott@xxxxxxxxxx> In 3.10.y backport patch 1dba303727f52ea062580b0a9b3f0c3b462769cf, the logic to call pm_qos_update_target was moved to __pm_qos_update_request. However, the original code was left in function pm_qos_update_request. Currently, if pm_qos_update_request is called where new_value != req->node.prio then pm_qos_update_target will be called twice in a row. Once in pm_qos_update_request and then again in the following call to _pm_qos_update_request. Removing the left over code from pm_qos_update_request stops this second call to pm_qos_update_target where the work of removing / re-adding the new_value in the constraints list would be duplicated. Signed-off-by: Michael Scott <michael.scott@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- kernel/power/qos.c | 6 ------ 1 file changed, 6 deletions(-) --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -369,12 +369,6 @@ void pm_qos_update_request(struct pm_qos } cancel_delayed_work_sync(&req->work); - - if (new_value != req->node.prio) - pm_qos_update_target( - pm_qos_array[req->pm_qos_class]->constraints, - &req->node, PM_QOS_UPDATE_REQ, new_value); - __pm_qos_update_request(req, new_value); } EXPORT_SYMBOL_GPL(pm_qos_update_request); Patches currently in stable-queue which might be from michael.scott@xxxxxxxxxx are queue-3.10/pm-qos-remove-duplicate-call-to-pm_qos_update_target.patch -- 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