1 files changed, 16 insertions, 1 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index fb0dcb994b84..fec07a12c6cd 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -250,6 +250,21 @@ config PPC_STD_MMU_32
         def_bool y
         depends on PPC_STD_MMU && PPC32
 
+config VIRT_CPU_ACCOUNTING
+        bool "Deterministic task and CPU time accounting"
+        depends on PPC64
+        default y
+        help
+          Select this option to enable more accurate task and CPU time
+          accounting.  This is done by reading a CPU counter on each
+          kernel entry and exit and on transitions within the kernel
+          between system, softirq and hardirq state, so there is a
+          small performance impact.  This also enables accounting of
+          stolen time on logically-partitioned systems running on
+          IBM POWER5-based machines.
+
+          If in doubt, say Y here.
+
 config SMP
         depends on PPC_STD_MMU
         bool "Symmetric multi-processing support"
@@ -974,7 +989,7 @@ source "arch/powerpc/oprofile/Kconfig"
 
 config KPROBES
         bool "Kprobes (EXPERIMENTAL)"
-        depends on PPC64
+        depends on PPC64 && EXPERIMENTAL && MODULES
         help
           Kprobes allows you to trap at almost any kernel address and
           execute a callback function.  register_kprobe() establishes