From: tip-bot for Stephen Rothwell <sfr@canb.auug.org.au>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
linuxppc-dev@lists.ozlabs.org, peterz@infradead.org,
namhyung.kim@lge.com, zhong@linux.vnet.ibm.com,
paulmck@linux.vnet.ibm.com, benh@kernel.crashing.org,
fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de,
sfr@canb.auug.org.au, paul.gortmaker@windriver.com
Subject: [tip:sched/core] cputime: Restore CPU_ACCOUNTING config defaults for PPC64
Date: Fri, 8 Feb 2013 07:18:56 -0800 [thread overview]
Message-ID: <tip-02fc8d37229d15c654876cf9ce56b5c1cf7945d7@git.kernel.org> (raw)
In-Reply-To: <20130208141938.f31b7b9e1acac5bbe769ee4c@canb.auug.org.au>
Commit-ID: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7
Gitweb: http://git.kernel.org/tip/02fc8d37229d15c654876cf9ce56b5c1cf7945d7
Author: Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate: Fri, 8 Feb 2013 14:19:38 +1100
Committer: Ingo Molnar <mingo@kernel.org>
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 <sfr@canb.auug.org.au>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: ppc-dev <linuxppc-dev@lists.ozlabs.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Link: http://lkml.kernel.org/r/20130208141938.f31b7b9e1acac5bbe769ee4c@canb.auug.org.au
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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
next prev parent reply other threads:[~2013-02-08 15:19 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 19:03 [GIT PULL] cputime: Full dynticks task/cputime accounting v7 Frederic Weisbecker
2013-01-28 19:03 ` [PATCH 1/8] context_tracking: Export context state for generic vtime Frederic Weisbecker
2013-01-28 19:03 ` [PATCH 2/8] cputime: Librarize per nsecs resolution cputime definitions Frederic Weisbecker
2013-02-14 19:49 ` Kevin Hilman
2013-02-20 16:07 ` Frederic Weisbecker
2013-01-28 19:04 ` [PATCH 3/8] cputime: Move default nsecs_to_cputime() to jiffies based cputime file Frederic Weisbecker
2013-01-28 19:04 ` [PATCH 4/8] cputime: Generic on-demand virtual cputime accounting Frederic Weisbecker
2013-02-08 3:07 ` Stephen Rothwell
2013-02-08 3:14 ` Stephen Rothwell
2013-02-08 3:19 ` [PATCH] cputime: restore CPU_ACCOUNTING config defaults for PPC64 Stephen Rothwell
2013-02-08 15:18 ` tip-bot for Stephen Rothwell [this message]
2013-02-08 14:31 ` [PATCH 4/8] cputime: Generic on-demand virtual cputime accounting Frederic Weisbecker
2013-01-28 19:04 ` [PATCH 5/8] cputime: Allow dynamic switch between tick/virtual based " Frederic Weisbecker
2013-01-28 19:04 ` [PATCH 6/8] cputime: Use accessors to read task cputime stats Frederic Weisbecker
2013-01-28 19:04 ` [PATCH 7/8] kvm: Prepare to add generic guest entry/exit callbacks Frederic Weisbecker
2013-01-28 19:04 ` [PATCH 8/8] cputime: Safely read cputime of full dynticks CPUs Frederic Weisbecker
2013-01-28 21:51 ` Sedat Dilek
2013-01-30 21:57 ` Sedat Dilek
2013-01-31 0:38 ` Frederic Weisbecker
2013-01-31 7:24 ` Sedat Dilek
2013-01-31 10:12 ` Frederic Weisbecker
2013-01-31 10:30 ` Sedat Dilek
2013-01-31 16:29 ` Frederic Weisbecker
2013-01-28 19:18 ` [GIT PULL] cputime: Full dynticks task/cputime accounting v7 Christoph Lameter
2013-01-28 19:21 ` Frederic Weisbecker
2013-01-28 20:14 ` Christoph Lameter
2013-01-29 1:42 ` Frederic Weisbecker
2013-01-29 0:02 ` Steven Rostedt
2013-01-29 1:36 ` Frederic Weisbecker
2013-01-29 2:36 ` Steven Rostedt
2013-01-29 2:39 ` Frederic Weisbecker
2013-01-29 2:44 ` Steven Rostedt
2013-01-29 3:29 ` Frederic Weisbecker
2013-01-29 4:38 ` Steven Rostedt
2013-01-29 15:12 ` Frederic Weisbecker
2013-01-29 16:46 ` Steven Rostedt
2013-01-29 16:55 ` Frederic Weisbecker
2013-01-29 17:08 ` Steven Rostedt
2013-01-29 21:26 ` Steven Rostedt
2013-01-29 21:37 ` Frederic Weisbecker
2013-02-15 1:55 ` Kevin Hilman
2013-02-15 14:04 ` Mats Liljegren
2013-02-15 15:06 ` Kevin Hilman
2013-02-20 15:53 ` Frederic Weisbecker
2013-02-20 17:53 ` Kevin Hilman
2013-02-20 15:44 ` Frederic Weisbecker
2013-02-20 18:48 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-02fc8d37229d15c654876cf9ce56b5c1cf7945d7@git.kernel.org \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paul.gortmaker@windriver.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=zhong@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).