1 files changed, 25 insertions, 1 deletions

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 702eb39901ca..610aaecc19f8 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -54,6 +54,18 @@ config DEBUG_PER_CPU_MAPS
 
           Say N if unsure.
 
+config X86_PTDUMP
+        bool "Export kernel pagetable layout to userspace via debugfs"
+        depends on DEBUG_KERNEL
+        select DEBUG_FS
+        help
+          Say Y here if you want to show the kernel pagetable layout in a
+          debugfs file. This information is only useful for kernel developers
+          who are working in architecture specific areas of the kernel.
+          It is probably not a good idea to enable this feature in a production
+          kernel.
+          If in doubt, say "N"
+
 config DEBUG_RODATA
         bool "Write protect kernel read-only data structures"
         default y
@@ -64,6 +76,18 @@ config DEBUG_RODATA
           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
@@ -82,8 +106,8 @@ config DEBUG_NX_TEST
 
 config 4KSTACKS
         bool "Use 4Kb for kernel stacks instead of 8Kb"
-        depends on DEBUG_KERNEL
         depends on X86_32
+        default y
         help
           If you say Y here the kernel will use a 4Kb stacksize for the
           kernel stack attached to each process/thread. This facilitates