From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 24 May 2011 13:02:07 +0000 (-0400)
Subject: Always use module-local ring buffer
X-Git-Tag: v2.0-pre1~101
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=2ae4650998642ce1aa762c66cdcba6cf6af25314;p=lttng-modules.git

Always use module-local ring buffer

We are doing modifications currently, so don't take chances using an
externally packaged ring buffer.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/wrapper/ringbuffer/api.h b/wrapper/ringbuffer/api.h
index c4b2ed73..182bee28 100644
--- a/wrapper/ringbuffer/api.h
+++ b/wrapper/ringbuffer/api.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/api.h>
-#else
 #include "../../lib/ringbuffer/api.h"
-#endif
diff --git a/wrapper/ringbuffer/backend.h b/wrapper/ringbuffer/backend.h
index 8f98bb3b..bfdd39de 100644
--- a/wrapper/ringbuffer/backend.h
+++ b/wrapper/ringbuffer/backend.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/backend.h>
-#else
 #include "../../lib/ringbuffer/backend.h"
-#endif
diff --git a/wrapper/ringbuffer/backend_internal.h b/wrapper/ringbuffer/backend_internal.h
index 0ed6b728..00d45e42 100644
--- a/wrapper/ringbuffer/backend_internal.h
+++ b/wrapper/ringbuffer/backend_internal.h
@@ -1,6 +1,2 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/backend_internal.h>
-#else
 #include "../../wrapper/inline_memcpy.h"
 #include "../../lib/ringbuffer/backend_internal.h"
-#endif
diff --git a/wrapper/ringbuffer/backend_types.h b/wrapper/ringbuffer/backend_types.h
index 41c65d2d..c59effda 100644
--- a/wrapper/ringbuffer/backend_types.h
+++ b/wrapper/ringbuffer/backend_types.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/backend_types.h>
-#else
 #include "../../lib/ringbuffer/backend_types.h"
-#endif
diff --git a/wrapper/ringbuffer/config.h b/wrapper/ringbuffer/config.h
index 12d9c279..0ce7a9da 100644
--- a/wrapper/ringbuffer/config.h
+++ b/wrapper/ringbuffer/config.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/config.h>
-#else
 #include "../../lib/ringbuffer/config.h"
-#endif
diff --git a/wrapper/ringbuffer/frontend.h b/wrapper/ringbuffer/frontend.h
index e454f3eb..7c6c0705 100644
--- a/wrapper/ringbuffer/frontend.h
+++ b/wrapper/ringbuffer/frontend.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/frontend.h>
-#else
 #include "../../lib/ringbuffer/frontend.h"
-#endif
diff --git a/wrapper/ringbuffer/frontend_api.h b/wrapper/ringbuffer/frontend_api.h
index 71b760e1..b03c501c 100644
--- a/wrapper/ringbuffer/frontend_api.h
+++ b/wrapper/ringbuffer/frontend_api.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/frontend_api.h>
-#else
 #include "../../lib/ringbuffer/frontend_api.h"
-#endif
diff --git a/wrapper/ringbuffer/frontend_internal.h b/wrapper/ringbuffer/frontend_internal.h
index 7cc821d6..18991014 100644
--- a/wrapper/ringbuffer/frontend_internal.h
+++ b/wrapper/ringbuffer/frontend_internal.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/frontend_internal.h>
-#else
 #include "../../lib/ringbuffer/frontend_internal.h"
-#endif
diff --git a/wrapper/ringbuffer/frontend_types.h b/wrapper/ringbuffer/frontend_types.h
index f4cd85b0..0c23244b 100644
--- a/wrapper/ringbuffer/frontend_types.h
+++ b/wrapper/ringbuffer/frontend_types.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/frontend_types.h>
-#else
 #include "../../lib/ringbuffer/frontend_types.h"
-#endif
diff --git a/wrapper/ringbuffer/iterator.h b/wrapper/ringbuffer/iterator.h
index d365afce..76e9edbb 100644
--- a/wrapper/ringbuffer/iterator.h
+++ b/wrapper/ringbuffer/iterator.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/iterator.h>
-#else
 #include "../../lib/ringbuffer/iterator.h"
-#endif
diff --git a/wrapper/ringbuffer/nohz.h b/wrapper/ringbuffer/nohz.h
index 1c614e0c..9fbb84d2 100644
--- a/wrapper/ringbuffer/nohz.h
+++ b/wrapper/ringbuffer/nohz.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/nohz.h>
-#else
 #include "../../lib/ringbuffer/nohz.h"
-#endif
diff --git a/wrapper/ringbuffer/vatomic.h b/wrapper/ringbuffer/vatomic.h
index 38a232bf..d5784452 100644
--- a/wrapper/ringbuffer/vatomic.h
+++ b/wrapper/ringbuffer/vatomic.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/vatomic.h>
-#else
 #include "../../lib/ringbuffer/vatomic.h"
-#endif
diff --git a/wrapper/ringbuffer/vfs.h b/wrapper/ringbuffer/vfs.h
index 061b2ccb..f8e9ed94 100644
--- a/wrapper/ringbuffer/vfs.h
+++ b/wrapper/ringbuffer/vfs.h
@@ -1,5 +1 @@
-#ifdef CONFIG_LIB_RING_BUFFER
-#include <linux/ringbuffer/vfs.h>
-#else
 #include "../../lib/ringbuffer/vfs.h"
-#endif