From patchwork Tue Mar 10 20:23:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Scott X-Patchwork-Id: 45612 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A17D4214BF for ; Tue, 10 Mar 2015 20:23:47 +0000 (UTC) Received: by wevk48 with SMTP id k48sf3263441wev.0 for ; Tue, 10 Mar 2015 13:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=iOhh38Q6C6Ptl9E0kt7URqHODEtL6cyLtzV2GRIjO4U=; b=ASEbHW7IBTMqhLnqk8k0zN8K+bM9zeocjyW3ng9oBIa6uV82ygUjzLQxsjT0ZMU4yH CMOgxw63yrZQtz4Pb+mgPTkmrWIawZRvJKIdepkOP/5hLkC2aOg6Ns329W2NlyRu4zxz X6FFIzn9j5N994iOqKfdZcooarfyv3ZwdMUIHtDilbs5PP/s5cAu8EpuU96DgJ8U1z/3 9+v5lVaxe4fN7L/7Ev+30dFXmPvfYa3V98cLt3unRDBBoggtpd2M5igoZWpg0ZKB86he Qt74PPtICFUpaOCteV8vNVT+cMzo///9PB7itzcsy19ChEBM8eLpjzVYC42gd3i1UCbU v2rQ== X-Gm-Message-State: ALoCoQm/yPkCYOl3zSe+mZvi9IHms8MJnFe2k+ppi5C+hRKRP0kTQsBP8rvNk5vudW3vUFilvc/k X-Received: by 10.180.80.35 with SMTP id o3mr3808wix.0.1426019026941; Tue, 10 Mar 2015 13:23:46 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.67 with SMTP id l3ls73886lae.93.gmail; Tue, 10 Mar 2015 13:23:46 -0700 (PDT) X-Received: by 10.152.28.5 with SMTP id x5mr31455358lag.112.1426019026778; Tue, 10 Mar 2015 13:23:46 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id ln11si970156lac.174.2015.03.10.13.23.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2015 13:23:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbiz12 with SMTP id z12so4438144lbi.5 for ; Tue, 10 Mar 2015 13:23:46 -0700 (PDT) X-Received: by 10.112.162.232 with SMTP id yd8mr31468256lbb.41.1426019026648; Tue, 10 Mar 2015 13:23:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2363574lbj; Tue, 10 Mar 2015 13:23:45 -0700 (PDT) X-Received: by 10.66.241.36 with SMTP id wf4mr12088763pac.8.1426019024957; Tue, 10 Mar 2015 13:23:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 11si2746972pdh.176.2015.03.10.13.23.44; Tue, 10 Mar 2015 13:23:44 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751368AbbCJUXn (ORCPT + 1 other); Tue, 10 Mar 2015 16:23:43 -0400 Received: from mail-oi0-f43.google.com ([209.85.218.43]:36904 "EHLO mail-oi0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751430AbbCJUXn (ORCPT ); Tue, 10 Mar 2015 16:23:43 -0400 Received: by oigi138 with SMTP id i138so3930165oig.4 for ; Tue, 10 Mar 2015 13:23:42 -0700 (PDT) X-Received: by 10.202.58.8 with SMTP id h8mr26146179oia.93.1426019022656; Tue, 10 Mar 2015 13:23:42 -0700 (PDT) Received: from localhost.localdomain (172-2-231-169.lightspeed.irvnca.sbcglobal.net. [172.2.231.169]) by mx.google.com with ESMTPSA id na2sm275626obb.28.2015.03.10.13.23.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Mar 2015 13:23:42 -0700 (PDT) From: Michael Scott To: rjw@rjwysocki.net Cc: stable@vger.kernel.org, Michael Scott Subject: [PATCH v3.10-stable] PM / QoS: remove duplicate call to pm_qos_update_target Date: Tue, 10 Mar 2015 13:23:36 -0700 Message-Id: <1426019016-16172-1-git-send-email-michael.scott@linaro.org> X-Mailer: git-send-email 2.1.4 Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: michael.scott@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- kernel/power/qos.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kernel/power/qos.c b/kernel/power/qos.c index 25cf89b..8703fc7 100644 --- a/kernel/power/qos.c +++ b/kernel/power/qos.c @@ -369,12 +369,6 @@ void pm_qos_update_request(struct pm_qos_request *req, } 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);