tracing/kmemtrace: normalize the raw tracer event to the unified tracing API

[safe/jmp/linux-2.6] / mm / kmemtrace.c

diff --git a/mm/kmemtrace.c b/mm/kmemtrace.c
index f7a49c0..0573b50 100644 (file)
--- a/mm/kmemtrace.c
+++ b/mm/kmemtrace.c
@@ -10,7 +10,7 @@
 #include <linux/module.h>
 #include <linux/marker.h>
 #include <linux/gfp.h>
-#include <linux/kmemtrace.h>
+#include <trace/kmemtrace.h>
 
 #define KMEMTRACE_SUBBUF_SIZE          524288
 #define KMEMTRACE_DEF_N_SUBBUFS                20
@@ -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
@@ -321,7 +319,7 @@ void kmemtrace_init(void)
        if (!kmemtrace_enabled) {
                printk(KERN_INFO "kmemtrace: disabled. Pass "
                        "kemtrace.enable=yes as kernel parameter for "
-                       "boot-time tracing.");
+                       "boot-time tracing.\n");
                return;
        }
        if (kmemtrace_start_probes()) {