VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-04-03 13:22:40 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-04-03 13:22:40 -0700 commit: 0ad5b053d438990fabaa324499abb6131b9d2202 parent: ff2ae607c6f329d11a3b0528801ea7474be8c3e9

Commit Summary:

Merge tag 'char-misc-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Diffstat:

1 file changed, 4 insertions, 3 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a85a6a423bf4..d1398cef3b18 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -98,7 +98,7 @@ config DYNAMIC_DEBUG
 	bool "Enable dynamic printk() support"
 	default n
 	depends on PRINTK
-	depends on DEBUG_FS
+	depends on (DEBUG_FS || PROC_FS)
 	help
 
 	  Compiles debug level messages into the kernel, which would not
@@ -116,8 +116,9 @@ config DYNAMIC_DEBUG
 	  Usage:
 
 	  Dynamic debugging is controlled via the 'dynamic_debug/control' file,
-	  which is contained in the 'debugfs' filesystem. Thus, the debugfs
-	  filesystem must first be mounted before making use of this feature.
+	  which is contained in the 'debugfs' filesystem or procfs.
+	  Thus, the debugfs or procfs filesystem must first be mounted before
+	  making use of this feature.
 	  We refer the control file as: <debugfs>/dynamic_debug/control. This
 	  file contains a list of the debug statements that can be enabled. The
 	  format for each line of the file is: