Browse Source

tracing: Fix TRACING_MAP Kconfig

The config option for TRACING_MAP has "default n", which is not needed
because the default of configs is 'n'.

Also, since the TRACING_MAP has no config prompt, there's no reason to
include "If in doubt, say N" in the help text.

Fixed a typo in the comments of tracing_map.h.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Steven Rostedt (Red Hat) 9 years ago
parent
commit
8d44f2f34f
2 changed files with 1 additions and 4 deletions
  1. 0 3
      kernel/trace/Kconfig
  2. 1 1
      kernel/trace/tracing_map.h

+ 0 - 3
kernel/trace/Kconfig

@@ -531,7 +531,6 @@ config MMIOTRACE
 config TRACING_MAP
 config TRACING_MAP
 	bool
 	bool
 	depends on ARCH_HAVE_NMI_SAFE_CMPXCHG
 	depends on ARCH_HAVE_NMI_SAFE_CMPXCHG
-	default n
 	help
 	help
 	  tracing_map is a special-purpose lock-free map for tracing,
 	  tracing_map is a special-purpose lock-free map for tracing,
 	  separated out as a stand-alone facility in order to allow it
 	  separated out as a stand-alone facility in order to allow it
@@ -539,8 +538,6 @@ config TRACING_MAP
 	  generally used outside of that context, and is normally
 	  generally used outside of that context, and is normally
 	  selected by tracers that use it.
 	  selected by tracers that use it.
 
 
-	  If in doubt, say N.
-
 config MMIOTRACE_TEST
 config MMIOTRACE_TEST
 	tristate "Test module for mmiotrace"
 	tristate "Test module for mmiotrace"
 	depends on MMIOTRACE && m
 	depends on MMIOTRACE && m

+ 1 - 1
kernel/trace/tracing_map.h

@@ -46,7 +46,7 @@ typedef int (*tracing_map_cmp_fn_t) (void *val_a, void *val_b);
  * That unique element now in the tracing_map_entry's 'val' field is
  * That unique element now in the tracing_map_entry's 'val' field is
  * an instance of tracing_map_elt, where 'elt' in the latter part of
  * an instance of tracing_map_elt, where 'elt' in the latter part of
  * that variable name is short for 'element'.  The purpose of a
  * that variable name is short for 'element'.  The purpose of a
- * tracing_map_elt is to hold values specific to the the particular
+ * tracing_map_elt is to hold values specific to the particular
  * 32-bit hashed key it's assocated with.  Things such as the unique
  * 32-bit hashed key it's assocated with.  Things such as the unique
  * set of aggregated sums associated with the 32-bit hashed key, along
  * set of aggregated sums associated with the 32-bit hashed key, along
  * with a copy of the full key associated with the entry, and which
  * with a copy of the full key associated with the entry, and which