X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=inline;f=wrapper%2Ftrace-clock.h;h=d2579725e4aaecd38bccc9fb7c5df89b56d455ee;hb=22f8d33adaf82f102c4cef3b95220d188b487693;hp=b2a90bd462e292f0f3f4eed6dd021da9b39138d0;hpb=97ca2c5484815a67b70fcf2b1772eb1b2c2e5633;p=lttng-modules.git

diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h
index b2a90bd4..d2579725 100644
--- a/wrapper/trace-clock.h
+++ b/wrapper/trace-clock.h
@@ -7,8 +7,8 @@
  * Dual LGPL v2.1/GPL v2 license.
  */
 
-#ifndef _LTT_TRACE_CLOCK_H
-#define _LTT_TRACE_CLOCK_H
+#ifndef _LTTNG_TRACE_CLOCK_H
+#define _LTTNG_TRACE_CLOCK_H
 
 #ifdef CONFIG_HAVE_TRACE_CLOCK
 #include <linux/trace-clock.h>
@@ -56,15 +56,18 @@ static inline u32 trace_clock_freq_scale(void)
 
 static inline int get_trace_clock(void)
 {
+	/*
+	 * LTTng: Using mainline kernel monotonic clock. NMIs will not be
+	 * traced, and expect significant performance degradation compared to
+	 * the LTTng trace clocks. Integration of the LTTng 0.x trace clocks
+	 * into LTTng 2.0 is planned in a near future.
+	 */
 	printk(KERN_WARNING "LTTng: Using mainline kernel monotonic clock.\n");
 	printk(KERN_WARNING "  * NMIs will not be traced,\n");
 	printk(KERN_WARNING "  * expect significant performance degradation compared to the\n");
 	printk(KERN_WARNING "    LTTng trace clocks.\n");
-	printk(KERN_WARNING "You should consider deploying a kernel with the the LTTng kernel\n");
-	printk(KERN_WARNING "patches, or, better, ask the Linux tracing maintainers to integrate\n");
-	printk(KERN_WARNING "them if you care deeply about this.\n");
-
-#warning "LTTng: Using mainline kernel monotonic clock. NMIs will not be traced, and expect significant performance degradation compared to the LTTng trace clocks. You should consider deploying a kernel with the the LTTng kernel patches, or, better, ask the Linux tracing maintainers to integrate them if you care deeply about this."
+	printk(KERN_WARNING "Integration of the LTTng 0.x trace clocks into LTTng 2.0 is planned\n");
+	printk(KERN_WARNING "in a near future.\n");
 
 	return 0;
 }
@@ -75,4 +78,4 @@ static inline void put_trace_clock(void)
 
 #endif /* CONFIG_HAVE_TRACE_CLOCK */
 
-#endif /* _LTT_TRACE_CLOCK_H */
+#endif /* _LTTNG_TRACE_CLOCK_H */