Merge branch 'linus' into x86/urgent

[linux-2.6] / arch / x86 / Kconfig.debug

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 5236621350bc9169d2be181e3de37d56c1a4a08b..f0cf5d9907947c6536ecf07ea5aa224db10623f4 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -5,10 +5,11 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
-config NONPROMISC_DEVMEM
-       bool "Filter access to /dev/mem"
+config PROMISC_DEVMEM
+       bool "Allow unlimited access to /dev/mem"
+       default y
        help
-         If this option is left off, you allow userspace access to all
+         If this option is left on, 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
          be used by people debugging the kernel.
@@ -179,7 +180,6 @@ config MMIOTRACE
        depends on DEBUG_KERNEL && PCI
        select TRACING
        select MMIOTRACE_HOOKS
-       default y
        help
          Mmiotrace traces Memory Mapped I/O access and is meant for
          debugging and reverse engineering. It is called from the ioremap