From patchwork Fri Feb 8 15:18:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 219205 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 55A882C03AA for ; Sat, 9 Feb 2013 02:20:28 +1100 (EST) Received: from terminus.zytor.com (terminus.zytor.com [IPv6:2001:1868:205::10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4DDA52C0082 for ; Sat, 9 Feb 2013 02:19:56 +1100 (EST) Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.14.5/8.14.5) with ESMTP id r18FIve2031631 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 8 Feb 2013 07:19:02 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.14.5/8.14.5/Submit) id r18FIu1v031628; Fri, 8 Feb 2013 07:18:56 -0800 Date: Fri, 8 Feb 2013 07:18:56 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Stephen Rothwell Message-ID: In-Reply-To: <20130208141938.f31b7b9e1acac5bbe769ee4c@canb.auug.org.au> References: <20130208141938.f31b7b9e1acac5bbe769ee4c@canb.auug.org.au> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] cputime: Restore CPU_ACCOUNTING config defaults for PPC64 Git-Commit-ID: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk X-Spam-Status: No, score=-0.3 required=5.0 tests=ALL_TRUSTED,BAYES_00, DATE_IN_FUTURE_96_Q autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on terminus.zytor.com X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (terminus.zytor.com [127.0.0.1]); Fri, 08 Feb 2013 07:19:04 -0800 (PST) Cc: namhyung.kim@lge.com, zhong@linux.vnet.ibm.com, sfr@canb.auug.org.au, peterz@infradead.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, fweisbec@gmail.com, paul.gortmaker@windriver.com, hpa@zytor.com, tglx@linutronix.de, paulmck@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, mingo@kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, peterz@infradead.org, linuxppc-dev@lists.ozlabs.org, namhyung.kim@lge.com, zhong@linux.vnet.ibm.com, paulmck@linux.vnet.ibm.com, fweisbec@gmail.com, benh@kernel.crashing.org, rostedt@goodmis.org, sfr@canb.auug.org.au, tglx@linutronix.de, paul.gortmaker@windriver.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Commit-ID: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7 Gitweb: http://git.kernel.org/tip/02fc8d37229d15c654876cf9ce56b5c1cf7945d7 Author: Stephen Rothwell AuthorDate: Fri, 8 Feb 2013 14:19:38 +1100 Committer: Ingo Molnar CommitDate: Fri, 8 Feb 2013 15:23:12 +0100 cputime: Restore CPU_ACCOUNTING config defaults for PPC64 Commit abf917cd91cb ("cputime: Generic on-demand virtual cputime accounting") inadvertantly changed the default CPU_ACCOUNTING config for PPC64. Repair that. Signed-off-by: Stephen Rothwell Acked-by: Frederic Weisbecker Cc: Li Zhong Cc: Namhyung Kim Cc: Paul E. McKenney Cc: Paul Gortmaker Cc: Peter Zijlstra Cc: Steven Rostedt Cc: ppc-dev Cc: Benjamin Herrenschmidt Link: http://lkml.kernel.org/r/20130208141938.f31b7b9e1acac5bbe769ee4c@canb.auug.org.au Signed-off-by: Ingo Molnar --- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index a05f843..ccb9f8f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -332,7 +332,7 @@ config VIRT_CPU_ACCOUNTING choice prompt "Cputime accounting" default TICK_CPU_ACCOUNTING if !PPC64 - default VIRT_CPU_ACCOUNTING if PPC64 + default VIRT_CPU_ACCOUNTING_NATIVE if PPC64 # Kind of a stub config for the pure tick based cputime accounting config TICK_CPU_ACCOUNTING