Commit-ID: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7 Gitweb: http://git.kernel.org/tip/02fc8d37229d15c654876cf9ce56b5c1cf7945d7 Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> AuthorDate: Fri, 8 Feb 2013 14:19:38 +1100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx> Cc: Li Zhong <zhong@xxxxxxxxxxxxxxxxxx> Cc: Namhyung Kim <namhyung.kim@xxxxxxx> Cc: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx> Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: ppc-dev <linuxppc-dev@xxxxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/20130208141938.f31b7b9e1acac5bbe769ee4c@xxxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html