From patchwork Mon Jan 4 10:49:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Youquan Song X-Patchwork-Id: 70594 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o043Fe3D014427 for ; Mon, 4 Jan 2010 03:15:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752926Ab0ADDOR (ORCPT ); Sun, 3 Jan 2010 22:14:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753382Ab0ADDOQ (ORCPT ); Sun, 3 Jan 2010 22:14:16 -0500 Received: from mga09.intel.com ([134.134.136.24]:43287 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752926Ab0ADDOM (ORCPT ); Sun, 3 Jan 2010 22:14:12 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 03 Jan 2010 19:13:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,496,1257148800"; d="scan'208";a="480967067" Received: from youquan-linux.bj.intel.com (HELO localhost) ([172.16.182.102]) by orsmga002.jf.intel.com with ESMTP; 03 Jan 2010 19:13:40 -0800 Date: Mon, 4 Jan 2010 05:49:05 -0500 From: "Youquan,Song" To: hpa@zytor.com, tglx@linutronix.de, akpm@linux-foundation.org Cc: venkatesh.pallipadi@intel.com, suresh.b.siddha@intel.com, kent.liu@intel.com, chaohong.guo@intel.com, youquan.song@intel.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH]tickless: Fix tick nohz timer irq0 fail to increaase Message-ID: <20100104104905.GA30574@youquan-linux.bj.intel.com> References: <20091214130233.GA3898@youquan-linux.bj.intel.com> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20091214130233.GA3898@youquan-linux.bj.intel.com> User-Agent: Mutt/1.5.9i Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index f992762..a515bed 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -815,7 +815,7 @@ int tick_check_oneshot_change(int allow_nohz) if (!timekeeping_valid_for_hres() || !tick_is_oneshot_available()) return 0; - if (!allow_nohz) + if (!allow_nohz && tick_nohz_enabled) return 1; tick_nohz_switch_to_nohz();