- Remove much of the inlining of the KTR tracepoints into a ktr_tracepoint()

  function declared in kern_ktr.c.  The only inline checks left are the
  checks that compare KTR_COMPILE with the supplied mask and thus should
  be optimized away into either nothing or a direct call to ktr_tracepoint().
- Move several KTR-related options to opt_ktr.h now that they are only
  needed by kern_ktr.c and not by ktr.h.
- Add in the ktr_verbose functionality if KTR_EXTEND is turned on.  If the
  global variable 'ktr_verbose' is non-zero, then KTR messages will be
  dumped to the console.  This variable can be set by either kernel code
  or via the 'debug.ktr_verbose' sysctl.  It defaults to off unless the
  KTR_VERBOSE kernel option is specified in which case it defaults to on.
  This can be useful when the machine locks up spinning in a loop with
  interrupts disabled as you might be able to see what it is doing when it
  locks up.

Requested by:	phk

1 files changed, 3 insertions, 2 deletions

diff --git a/sys/conf/options b/sys/conf/options
index bdfc98ab09a8..3c4338692f5e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -461,11 +461,12 @@ PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
 TDFX_LINUX opt_tdfx.h
 
 KTR			opt_global.h
-KTR_MASK		opt_global.h
-KTR_CPUMASK		opt_global.h
+KTR_MASK		opt_ktr.h
+KTR_CPUMASK		opt_ktr.h
 KTR_COMPILE		opt_global.h
 KTR_ENTRIES		opt_global.h
 KTR_EXTEND		opt_global.h
+KTR_VERBOSE		opt_ktr.h
 MUTEX_DEBUG		opt_global.h
 WITNESS			opt_global.h
 WITNESS_DDB		opt_witness.h