Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 7ce8e702566182320554e82c52f87d9dfe97bf1a..ac1e31ba4795cb0f067a280826da257432f93f33 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -5,6 +5,17 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
 
 source "lib/Kconfig.debug"
 

+config NONPROMISC_DEVMEM
+       bool "Disable promiscuous /dev/mem"
+       help
+         The /dev/mem file by default only allows userspace access to PCI
+         space and the BIOS code and data regions. This is sufficient for
+         dosemu and X and all common users of /dev/mem. With this config
+         option, you allow userspace access to all of memory, including
+         kernel and userspace memory. Accidental access to this is
+         obviously disasterous, but specific access can be used by people
+         debugging the kernel.
+

 config EARLY_PRINTK
        bool "Early printk" if EMBEDDED
        default y
 config EARLY_PRINTK
        bool "Early printk" if EMBEDDED
        default y


@@ -76,6 +87,18 @@ config DEBUG_RODATA
          data. This is recommended so that we can catch kernel bugs sooner.
          If in doubt, say "Y".
 
          data. This is recommended so that we can catch kernel bugs sooner.
          If in doubt, say "Y".
 

+config DIRECT_GBPAGES
+       bool "Enable gbpages-mapped kernel pagetables"
+       depends on DEBUG_KERNEL && EXPERIMENTAL && X86_64
+       help
+         Enable gigabyte pages support (if the CPU supports it). This can
+         improve the kernel's performance a tiny bit by reducing TLB
+         pressure.
+
+         This is experimental code.
+
+         If in doubt, say "N".
+

 config DEBUG_RODATA_TEST
        bool "Testcase for the DEBUG_RODATA feature"
        depends on DEBUG_RODATA
 config DEBUG_RODATA_TEST
        bool "Testcase for the DEBUG_RODATA feature"
        depends on DEBUG_RODATA


@@ -94,7 +117,6 @@ config DEBUG_NX_TEST
 
 config 4KSTACKS
        bool "Use 4Kb for kernel stacks instead of 8Kb"
 
 config 4KSTACKS
        bool "Use 4Kb for kernel stacks instead of 8Kb"

-       depends on DEBUG_KERNEL

        depends on X86_32
        help
          If you say Y here the kernel will use a 4Kb stacksize for the
        depends on X86_32
        help
          If you say Y here the kernel will use a 4Kb stacksize for the


@@ -233,4 +255,18 @@ config CPA_DEBUG
        help
          Do change_page_attr() self-tests every 30 seconds.
 
        help
          Do change_page_attr() self-tests every 30 seconds.
 

+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
+         do what it thinks is best, which is desirable for the gcc 3.x series of
+         compilers. The gcc 4.x series have a rewritten inlining algorithm and
+         disabling this option will generate a smaller kernel there. Hopefully
+         this algorithm is so good that allowing gcc4 to make the decision can
+         become the default in the future, until then this option is there to
+         test gcc for this.
+

 endmenu
 endmenu

+