[PATCH 1/2] kconfig: move DEBUG_FS out of compilation options

[PATCH 1/2] kconfig: move DEBUG_FS out of compilation options

[Thadeu Lima de Souza Cascardo]

Since 6dfc06651b3d29aa07ed99b8075e5d324f7a953a ("consolidate compilation
option configs"), DEBUG_FS has been hidden under the "Compile-time
checks and compiler options".

Move it out of that menu.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
---
 lib/Kconfig.debug |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c5cefb3..48edcbc 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -254,18 +254,6 @@ config PAGE_OWNER
 
 	  If unsure, say N.
 
-config DEBUG_FS
-	bool "Debug Filesystem"
-	help
-	  debugfs is a virtual file system that kernel developers use to put
-	  debugging files into.  Enable this option to be able to read and
-	  write to these files.
-
-	  For detailed documentation on the debugfs API, see
-	  Documentation/DocBook/filesystems.
-
-	  If unsure, say N.
-
 config HEADERS_CHECK
 	bool "Run 'make headers_check' when building vmlinux"
 	depends on !UML
@@ -349,6 +337,18 @@ config DEBUG_FORCE_WEAK_PER_CPU
 
 endmenu # "Compiler options"
 
+config DEBUG_FS
+	bool "Debug Filesystem"
+	help
+	  debugfs is a virtual file system that kernel developers use to put
+	  debugging files into.  Enable this option to be able to read and
+	  write to these files.
+
+	  For detailed documentation on the debugfs API, see
+	  Documentation/DocBook/filesystems.
+
+	  If unsure, say N.
+
 config MAGIC_SYSRQ
 	bool "Magic SysRq key"
 	depends on !UML
-- 
1.7.10.4

[PATCH 2/2] kconfig: move PAGE_OWNER into "Memory Debugging" menu

[Thadeu Lima de Souza Cascardo]

PAGE_OWNER has been put into the "Compiler-time checks and compiler
options" menu. It belongs to "Memory Debugging", next to "Kernel memory
leak detector".

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
---
 lib/Kconfig.debug |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 48edcbc..e9b2cb0 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -238,22 +238,6 @@ config UNUSED_SYMBOLS
 	  you really need it, and what the merge plan to the mainline kernel for
 	  your module is.
 
-config PAGE_OWNER
-	bool "Track page owner"
-	depends on DEBUG_KERNEL && STACKTRACE_SUPPORT
-	select DEBUG_FS
-	select STACKTRACE
-	select PAGE_EXTENSION
-	help
-	  This keeps track of what call chain is the owner of a page, may
-	  help to find bare alloc_page(s) leaks. Even if you include this
-	  feature on your build, it is disabled in default. You should pass
-	  "page_owner=on" to boot parameter in order to enable it. Eats
-	  a fair amount of memory if enabled. See tools/vm/page_owner_sort.c
-	  for user-space helper.
-
-	  If unsure, say N.
-
 config HEADERS_CHECK
 	bool "Run 'make headers_check' when building vmlinux"
 	depends on !UML
@@ -534,6 +518,22 @@ config DEBUG_KMEMLEAK_DEFAULT_OFF
 	  Say Y here to disable kmemleak by default. It can then be enabled
 	  on the command line via kmemleak=on.
 
+config PAGE_OWNER
+	bool "Track page owner"
+	depends on DEBUG_KERNEL && STACKTRACE_SUPPORT
+	select DEBUG_FS
+	select STACKTRACE
+	select PAGE_EXTENSION
+	help
+	  This keeps track of what call chain is the owner of a page, may
+	  help to find bare alloc_page(s) leaks. Even if you include this
+	  feature on your build, it is disabled in default. You should pass
+	  "page_owner=on" to boot parameter in order to enable it. Eats
+	  a fair amount of memory if enabled. See tools/vm/page_owner_sort.c
+	  for user-space helper.
+
+	  If unsure, say N.
+
 config DEBUG_STACK_USAGE
 	bool "Stack utilization instrumentation"
 	depends on DEBUG_KERNEL && !IA64 && !PARISC && !METAG
-- 
1.7.10.4

Re: [PATCH 1/2] kconfig: move DEBUG_FS out of compilation options

[Dave Hansen]

On 03/25/2015 07:22 AM, Thadeu Lima de Souza Cascardo wrote:
> Since 6dfc06651b3d29aa07ed99b8075e5d324f7a953a ("consolidate compilation
> option configs"), DEBUG_FS has been hidden under the "Compile-time
> checks and compiler options".
> 
> Move it out of that menu.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>

Looks fine to me.  Feel free to add my ack.

Looks like PAGE_OWNER got merged in to the wrong spot it probably needs
to get moved over to "Memory Debugging".

Re: [PATCH 1/2] kconfig: move DEBUG_FS out of compilation options

[cascardo]

On Wed, Mar 25, 2015 at 07:56:53AM -0700, Dave Hansen wrote:
> On 03/25/2015 07:22 AM, Thadeu Lima de Souza Cascardo wrote:
> > Since 6dfc06651b3d29aa07ed99b8075e5d324f7a953a ("consolidate compilation
> > option configs"), DEBUG_FS has been hidden under the "Compile-time
> > checks and compiler options".
> > 
> > Move it out of that menu.
> > 
> > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
> > Cc: Dave Hansen <dave.hansen@linux.intel.com>
> 
> Looks fine to me.  Feel free to add my ack.
> 
> Looks like PAGE_OWNER got merged in to the wrong spot it probably needs
> to get moved over to "Memory Debugging".
> 

Sorry I did not copy you on that one, but I sent a second patch with
that change as well.

Thanks.
Cascardo.