From patchwork Fri Mar 28 12:26:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 27275 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DF93D20062 for ; Fri, 28 Mar 2014 12:27:07 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf10565313qcq.8 for ; Fri, 28 Mar 2014 05:27:07 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=GrGgrsWIJE7/YbWB+MYQMng/5jKCUqOSMvDUbtEmtAw=; b=kmA8NBRggsuVoZlYhgNwCc0PEhVW9nN3oFH+OYOoVYc1w23VEron5k8JL0qgkfq6/F 6OZ2beBiRpmHiNsT74f62R9Q8B6kjkrKi5KfCPepaf2Q0MhnHB6s6TgEPrs4IlA7MLDL Kt1i2E8ve0KyoF0bs921rWNTMZ6JxWCaIkAxTUwoHFG/m2iPqePPxFiy54uHll2mOMR/ p/5RegkXc9aZ8EJR7Zy+3nrl4z4J/j05+iZcdXJuVQi6Nv6jwJVwj8ezy7Pz8kob9Mua gtORKQ8D2LrO2QAJ6vcNB8yH1XPo3uj++7f9EdOjNWvn4YUg9Kks92i12NaljfEYr95I 3u6w== X-Gm-Message-State: ALoCoQlDW+R8tNwh6Hl6lb2SN9D5GkxANr3HyZlcLYIVtfUeTAW/lxWOkZasyLI6FzUJyMrEA2+j X-Received: by 10.58.39.202 with SMTP id r10mr3203388vek.12.1396009627637; Fri, 28 Mar 2014 05:27:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.37 with SMTP id e34ls1411300qge.4.gmail; Fri, 28 Mar 2014 05:27:07 -0700 (PDT) X-Received: by 10.58.152.142 with SMTP id uy14mr6875083veb.4.1396009627542; Fri, 28 Mar 2014 05:27:07 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id s7si632636vev.56.2014.03.28.05.27.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 05:27:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id if17so5650127vcb.8 for ; Fri, 28 Mar 2014 05:27:07 -0700 (PDT) X-Received: by 10.58.57.67 with SMTP id g3mr6876849veq.3.1396009627457; Fri, 28 Mar 2014 05:27:07 -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.220.12.8 with SMTP id v8csp4347vcv; Fri, 28 Mar 2014 05:27:07 -0700 (PDT) X-Received: by 10.66.193.161 with SMTP id hp1mr8417479pac.20.1396009626736; Fri, 28 Mar 2014 05:27:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iu9si3587793pac.248.2014.03.28.05.27.06; Fri, 28 Mar 2014 05:27:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751620AbaC1M06 (ORCPT + 27 others); Fri, 28 Mar 2014 08:26:58 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:43410 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbaC1M05 (ORCPT ); Fri, 28 Mar 2014 08:26:57 -0400 Received: by mail-pd0-f173.google.com with SMTP id z10so4790458pdj.32 for ; Fri, 28 Mar 2014 05:26:57 -0700 (PDT) X-Received: by 10.66.231.104 with SMTP id tf8mr8431912pac.48.1396009617118; Fri, 28 Mar 2014 05:26:57 -0700 (PDT) Received: from localhost ([122.178.232.239]) by mx.google.com with ESMTPSA id ei4sm22474073pbb.42.2014.03.28.05.26.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Mar 2014 05:26:56 -0700 (PDT) From: Viresh Kumar To: tglx@linutronix.de Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, linaro-networking@linaro.org, arvind.chauhan@arm.com, Viresh Kumar Subject: [PATCH V2 16/16] hrtimer: use base->hres_active directly instead of hrtimer_hres_active() Date: Fri, 28 Mar 2014 17:56:49 +0530 Message-Id: <3f690ebdc501ea2b6c8930a42598773b1d9b3188.1396009485.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , use base->hres_active directly when we already have a pointer to base instead of calling hrtimer_hres_active(). As that would lead to: __this_cpu_read(hrtimer_bases.hres_active) Signed-off-by: Viresh Kumar --- V1->V2: Removed few entries as hres_active isn't available if CONFIG_HIGH_RES_TIMERS isn't enabled. kernel/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 83e5f2d..9e18145 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -883,7 +883,7 @@ static void __remove_hrtimer(struct hrtimer *timer, unsigned long newstate, #ifdef CONFIG_HIGH_RES_TIMERS /* Reprogram the clock event device. if enabled */ - if (reprogram && hrtimer_hres_active() && + if (reprogram && base->cpu_base->hres_active && &timer->node == timerqueue_getnext(&base->active)) { ktime_t expires;