Browse Source

kmemtrace: remove config option for enabling tracing at boot

Users can pass kmemtrace.enabled=yes as a kernel parameter to enable kmemtrace
at boot so remove the useless CONFIG_KMEMTRACE_DEFAULT_ENABLED config option.

Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Pekka Enberg 16 năm trước cách đây
mục cha
commit
bf6803d6fd
3 tập tin đã thay đổi với 4 bổ sung14 xóa
  1. 1 1
      Documentation/vm/kmemtrace.txt
  2. 0 8
      lib/Kconfig.debug
  3. 3 5
      mm/kmemtrace.c

+ 1 - 1
Documentation/vm/kmemtrace.txt

@@ -61,7 +61,7 @@ III. Quick usage guide
 ======================
 
 1) Get a kernel that supports kmemtrace and build it accordingly (i.e. enable
-CONFIG_KMEMTRACE and CONFIG_KMEMTRACE_DEFAULT_ENABLED).
+CONFIG_KMEMTRACE).
 
 2) Get the userspace tool and build it:
 $ git-clone git://repo.or.cz/kmemtrace-user.git		# current repository

+ 0 - 8
lib/Kconfig.debug

@@ -823,14 +823,6 @@ config KMEMTRACE
 
 	  If unsure, say N.
 
-config KMEMTRACE_DEFAULT_ENABLED
-	bool "Enabled by default at boot"
-	depends on KMEMTRACE
-	help
-	  Say Y here to enable kmemtrace at boot-time by default. Whatever
-	  the choice, the behavior can be overridden by a kernel parameter,
-	  as described in documentation.
-
 menuconfig BUILD_DOCSRC
 	bool "Build targets in Documentation/ tree"
 	depends on HEADERS_CHECK

+ 3 - 5
mm/kmemtrace.c

@@ -19,11 +19,9 @@ static struct rchan *kmemtrace_chan;
 static u32 kmemtrace_buf_overruns;
 
 static unsigned int kmemtrace_n_subbufs;
-#ifdef CONFIG_KMEMTRACE_DEFAULT_ENABLED
-static unsigned int kmemtrace_enabled = 1;
-#else
-static unsigned int kmemtrace_enabled = 0;
-#endif
+
+/* disabled by default */
+static unsigned int kmemtrace_enabled;
 
 /*
  * The sequence number is used for reordering kmemtrace packets