Merge commit 'origin'

[linux-2.6-omap-h63xx.git] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index ae36bfa814e5b389d706b9cc3fa1d879f16abe8b..2a3dfbd5e677b548e5e75f43da69e934b90a7eff 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -5,13 +5,15 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
 
 source "lib/Kconfig.debug"
 

-config NONPROMISC_DEVMEM
+config STRICT_DEVMEM

        bool "Filter access to /dev/mem"
        help
        bool "Filter access to /dev/mem"
        help

-         If this option is left off, you allow userspace access to all
+         If this option is disabled, you allow userspace (root) access to all

          of memory, including kernel and userspace memory. Accidental
          access to this is obviously disastrous, but specific access can
          of memory, including kernel and userspace memory. Accidental
          access to this is obviously disastrous, but specific access can

-         be used by people debugging the kernel.
+         be used by people debugging the kernel. Note that with PAT support
+         enabled, even in this case there are restrictions on /dev/mem
+         use due to the cache aliasing requirements.

 
          If this option is switched on, the /dev/mem file only allows
          userspace access to PCI space and the BIOS code and data regions.
 
          If this option is switched on, the /dev/mem file only allows
          userspace access to PCI space and the BIOS code and data regions.


@@ -41,6 +43,19 @@ config EARLY_PRINTK
          with klogd/syslogd or the X server. You should normally N here,
          unless you want to debug such a crash.
 
          with klogd/syslogd or the X server. You should normally N here,
          unless you want to debug such a crash.
 

+config EARLY_PRINTK_DBGP
+       bool "Early printk via EHCI debug port"
+       default n
+       depends on EARLY_PRINTK && PCI
+       help
+         Write kernel log output directly into the EHCI debug port.
+
+         This is useful for kernel debugging when your machine crashes very
+         early before the console code is initialized. For normal operation
+         it is not recommended because it looks ugly and doesn't cooperate
+         with klogd/syslogd or the X server. You should normally N here,
+         unless you want to debug such a crash. You need usb debug device.
+

 config DEBUG_STACKOVERFLOW
        bool "Check for stack overflows"
        depends on DEBUG_KERNEL
 config DEBUG_STACKOVERFLOW
        bool "Check for stack overflows"
        depends on DEBUG_KERNEL


@@ -287,7 +302,6 @@ config CPA_DEBUG
 
 config OPTIMIZE_INLINING
        bool "Allow gcc to uninline functions marked 'inline'"
 
 config OPTIMIZE_INLINING
        bool "Allow gcc to uninline functions marked 'inline'"

-       depends on BROKEN

        help
          This option determines if the kernel forces gcc to inline the functions
          developers have marked 'inline'. Doing so takes away freedom from gcc to
        help
          This option determines if the kernel forces gcc to inline the functions
          developers have marked 'inline'. Doing so takes away freedom from gcc to


@@ -298,5 +312,7 @@ config OPTIMIZE_INLINING
          become the default in the future, until then this option is there to
          test gcc for this.
 
          become the default in the future, until then this option is there to
          test gcc for this.
 

+         If unsure, say N.
+

 endmenu
 
 endmenu