From patchwork Mon Jun 30 11:50:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 32702 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0C502203C0 for ; Mon, 30 Jun 2014 12:05:10 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id l6sf17105834qcy.10 for ; Mon, 30 Jun 2014 05:05:09 -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: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=53VIP4g2oTL/liM5ngiZL39jFhWGfzm3Sj3QMt/cVGQ=; b=SV8js2+miCmhRo1kgpCageSEsMTPcwqW3NeCkZj9CyLXmEeHFwDSKM8tc7iwTLmFuI Ug08DXn67d7qCIOO+B2ldX5jGAD0NncOIXem5/5F96DrPeKICrORU8E2kE1gWsOBF/wG hTBcNhqPM4MSCenEZlbPuYPtJefwhmzLoospeMPPN7CY9l3DT0zDGhiBTZegpHYdmgAF DngDBvNadJHAyri2z/KGXuS5CR737m8MP+drh0qETFo5qcxlkgb45iP87Rk2/gqrM/qD gCeL7f0WJVRhiBKOvNqlaGmK1PcCYMH7Y4/haAE04LeMHonJ77pstGVQei1RhfLEyQSo jegg== X-Gm-Message-State: ALoCoQlY7XxPnM8WrAJRr19l+oDVX2pGGMxUoyViUvGTK++73utXTLybz1rymTuZvcnDZn7eldUc X-Received: by 10.236.66.105 with SMTP id g69mr361473yhd.11.1404129909895; Mon, 30 Jun 2014 05:05:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.207 with SMTP id r73ls254979qgd.44.gmail; Mon, 30 Jun 2014 05:05:09 -0700 (PDT) X-Received: by 10.221.41.135 with SMTP id tu7mr2652vcb.70.1404129909741; Mon, 30 Jun 2014 05:05:09 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id cl2si9921235vcb.98.2014.06.30.05.05.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 05:05:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.176 as permitted sender) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id db12so7969596veb.21 for ; Mon, 30 Jun 2014 05:05:09 -0700 (PDT) X-Received: by 10.52.138.232 with SMTP id qt8mr686956vdb.44.1404129909592; Mon, 30 Jun 2014 05:05:09 -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.221.37.5 with SMTP id tc5csp132059vcb; Mon, 30 Jun 2014 05:05:09 -0700 (PDT) X-Received: by 10.68.231.196 with SMTP id ti4mr52348506pbc.48.1404129908687; Mon, 30 Jun 2014 05:05:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id dn8si22903728pac.129.2014.06.30.05.05.07; Mon, 30 Jun 2014 05:05:07 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1756006AbaF3MDd (ORCPT + 27 others); Mon, 30 Jun 2014 08:03:33 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:52053 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753816AbaF3LxZ (ORCPT ); Mon, 30 Jun 2014 07:53:25 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.80.1) (envelope-from ) id 1X1a9C-0000Wf-OM; Mon, 30 Jun 2014 13:53:22 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Viresh Kumar , linaro-kernel@lists.linaro.org, fweisbec@gmail.com, Arvind.Chauhan@arm.com, linaro-networking@linaro.org, Thomas Gleixner , Jiri Slaby Subject: [PATCH 3.12 006/181] tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz() Date: Mon, 30 Jun 2014 13:50:27 +0200 Message-Id: X-Mailer: git-send-email 2.0.0 In-Reply-To: <61844d8e25eb8899b0836afa9796fa239db80f1f.1404128997.git.jslaby@suse.cz> References: <61844d8e25eb8899b0836afa9796fa239db80f1f.1404128997.git.jslaby@suse.cz> 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: linux-kernel-owner@vger.kernel.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.128.176 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: , From: Viresh Kumar 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit 27630532ef5ead28b98cfe28d8f95222ef91c2b7 upstream. Since commit d689fe222 (NOHZ: Check for nohz active instead of nohz enabled) the tick_nohz_switch_to_nohz() function returns because it checks for the tick_nohz_active flag. This can't be set, because the function itself sets it. Undo the change in tick_nohz_switch_to_nohz(). Signed-off-by: Viresh Kumar Cc: linaro-kernel@lists.linaro.org Cc: fweisbec@gmail.com Cc: Arvind.Chauhan@arm.com Cc: linaro-networking@linaro.org Cc: # 3.13+ Link: http://lkml.kernel.org/r/40939c05f2d65d781b92b20302b02243d0654224.1397537987.git.viresh.kumar@linaro.org Signed-off-by: Thomas Gleixner Signed-off-by: Jiri Slaby --- kernel/time/tick-sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index ea20f7d1ac2c..29b063b32ff0 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -970,7 +970,7 @@ static void tick_nohz_switch_to_nohz(void) struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched); ktime_t next; - if (!tick_nohz_active) + if (!tick_nohz_enabled) return; local_irq_disable();