From: Andrew Morton The Kconfig text for CONFIG_DEBUG_SLAB and CONFIG_DEBUG_PAGEALLOC have always seemed a bit confusing. Change them to: CONFIG_DEBUG_SLAB: "Debug slab memory allocations" CONFIG_DEBUG_PAGEALLOC: "Debug page memory allocations" Cc: "David S. Miller" Cc: Hirokazu Takata Signed-off-by: Andrew Morton --- arch/i386/Kconfig.debug | 2 +- arch/m32r/Kconfig.debug | 2 +- arch/sparc64/Kconfig.debug | 2 +- lib/Kconfig.debug | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/i386/Kconfig.debug~kconfig-clarify-memory-debug-options arch/i386/Kconfig.debug --- devel/arch/i386/Kconfig.debug~kconfig-clarify-memory-debug-options 2006-03-11 02:46:56.000000000 -0800 +++ devel-akpm/arch/i386/Kconfig.debug 2006-03-11 02:46:56.000000000 -0800 @@ -44,7 +44,7 @@ comment "Page alloc debug is incompatibl depends on DEBUG_KERNEL && SOFTWARE_SUSPEND config DEBUG_PAGEALLOC - bool "Page alloc debugging" + bool "Debug page memory allocations" depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND help Unmap pages from the kernel linear mapping after free_pages(). diff -puN arch/m32r/Kconfig.debug~kconfig-clarify-memory-debug-options arch/m32r/Kconfig.debug --- devel/arch/m32r/Kconfig.debug~kconfig-clarify-memory-debug-options 2006-03-11 02:46:56.000000000 -0800 +++ devel-akpm/arch/m32r/Kconfig.debug 2006-03-11 02:46:56.000000000 -0800 @@ -19,7 +19,7 @@ config DEBUG_STACK_USAGE This option will slow down process creation somewhat. config DEBUG_PAGEALLOC - bool "Page alloc debugging" + bool "Debug page memory allocations" depends on DEBUG_KERNEL && BROKEN help Unmap pages from the kernel linear mapping after free_pages(). diff -puN arch/sparc64/Kconfig.debug~kconfig-clarify-memory-debug-options arch/sparc64/Kconfig.debug --- devel/arch/sparc64/Kconfig.debug~kconfig-clarify-memory-debug-options 2006-03-11 02:46:56.000000000 -0800 +++ devel-akpm/arch/sparc64/Kconfig.debug 2006-03-11 02:46:56.000000000 -0800 @@ -24,7 +24,7 @@ config DEBUG_BOOTMEM bool "Debug BOOTMEM initialization" config DEBUG_PAGEALLOC - bool "Page alloc debugging" + bool "Debug page memory allocations" depends on DEBUG_KERNEL && !SOFTWARE_SUSPEND help Unmap pages from the kernel linear mapping after free_pages(). diff -puN lib/Kconfig.debug~kconfig-clarify-memory-debug-options lib/Kconfig.debug --- devel/lib/Kconfig.debug~kconfig-clarify-memory-debug-options 2006-03-11 02:46:56.000000000 -0800 +++ devel-akpm/lib/Kconfig.debug 2006-03-11 02:46:56.000000000 -0800 @@ -78,7 +78,7 @@ config SCHEDSTATS this adds. config DEBUG_SLAB - bool "Debug memory allocations" + bool "Debug slab memory allocations" depends on DEBUG_KERNEL && SLAB help Say Y here to have the kernel do limited verification on memory _