[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / arch / powerpc / Kconfig.debug

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 9254806..5ad149b 100644 (file)
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -18,6 +18,20 @@ config DEBUG_STACK_USAGE
 
          This option will slow down process creation somewhat.
 
+config HCALL_STATS
+       bool "Hypervisor call instrumentation"
+       depends on PPC_PSERIES && DEBUG_FS
+       help
+         Adds code to keep track of the number of hypervisor calls made and
+         the amount of time spent in hypervisor callsr.  Wall time spent in
+         each call is always calculated, and if available CPU cycles spent
+         are also calculated.  A directory named hcall_inst is added at the
+         root of the debugfs filesystem.  Within the hcall_inst directory
+         are files that contain CPU specific call statistics.
+
+         This option will add a small amount of overhead to all hypervisor
+         calls.
+
 config DEBUGGER
        bool "Enable debugger hooks"
        depends on DEBUG_KERNEL
@@ -74,6 +88,8 @@ config XMON
          very early during boot. 'xmon=on' will just enable the xmon
          debugger hooks.  'xmon=off' will disable the debugger hooks
          if CONFIG_XMON_DEFAULT is set.
+         xmon will print a backtrace on the very first invocation.
+         'xmon=nobt' will disable this autobacktrace.
 
 config XMON_DEFAULT
        bool "Enable xmon by default"
@@ -110,18 +126,16 @@ config SERIAL_TEXT_DEBUG
        depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
                PPC_GEN550 || PPC_MPC52xx
 
-config PPC_OCP
-       bool
-       depends on IBM_OCP || XILINX_OCP
-       default y
+config PPC_EARLY_DEBUG
+       bool "Early debugging (dangerous)"
 
 choice
-       prompt "Early debugging (dangerous)"
-       bool
-       optional
+       prompt "Early debugging console"
+       depends on PPC_EARLY_DEBUG
        help
-         Enable early debugging. Careful, if you enable debugging for the
-         wrong type of machine your kernel _will not boot_.
+         Use the selected console for early debugging. Careful, if you
+         enable debugging for the wrong type of machine your kernel
+         _will not boot_.
 
 config PPC_EARLY_DEBUG_LPAR
        bool "LPAR HV Console"
@@ -136,12 +150,19 @@ config PPC_EARLY_DEBUG_G5
        help
          Select this to enable early debugging for Apple G5 machines.
 
-config PPC_EARLY_DEBUG_RTAS
+config PPC_EARLY_DEBUG_RTAS_PANEL
        bool "RTAS Panel"
        depends on PPC_RTAS
        help
          Select this to enable early debugging via the RTAS panel.
 
+config PPC_EARLY_DEBUG_RTAS_CONSOLE
+       bool "RTAS Console"
+       depends on PPC_RTAS
+       select UDBG_RTAS_CONSOLE
+       help
+         Select this to enable early debugging via the RTAS console.
+
 config PPC_EARLY_DEBUG_MAPLE
        bool "Maple real mode"
        depends on PPC_MAPLE