From bd4d511c5bf80ddca02e68bdb92caf4ffb23f87a Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 8 Feb 2013 14:19:38 +1100 Subject: [PATCH] --- yaml --- r: 350145 b: refs/heads/master c: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7 h: refs/heads/master i: 350143: 3546d2ead1e44e7bbae3615245ba11e98d7baf46 v: v3 --- [refs] | 2 +- trunk/init/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a5610d5f32a..2524cdac2e78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bd75c77b7c6a3954140dd2e20346aef3efe4a35 +refs/heads/master: 02fc8d37229d15c654876cf9ce56b5c1cf7945d7 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index a05f843e7e52..ccb9f8f87f40 100644 --- a/trunk/init/Kconfig +++ b/trunk/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