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 c4b2ed73ae2e9b96c291c87e52fff76beec2e6b5..182bee2840161f18473dcfc62b5b5ce2be8102fc 100644 (file)
--- 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 8f98bb3bad3baecca638ec4678866be3a1d6d15f..bfdd39def1a950b998266e62e574516ec193ef20 100644 (file)
--- 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 0ed6b728d83aa95a7619d20ab6a61dd56688eb3c..00d45e42a60e3142ecc2d9f1256e2dcd4363339d 100644 (file)
--- 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 41c65d2d67b287668e83a8f4469bfa8b628cfe8a..c59effda7de3d0231ab01c9bab897d1268831ce8 100644 (file)
--- 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 12d9c279b55c2ee0f3eb4b5a4af6e0df182ff1bb..0ce7a9dac5588bc87e441a813c6b4706add646d7 100644 (file)
--- 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 e454f3eb4a8e26bc8150cd1d26290fd3219ed54f..7c6c07052afb1f8428bce2c52cd3aaf3a9c4f25f 100644 (file)
--- 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 71b760e1a913b6adab5cc70d6d62aa4a212ca62c..b03c501cc3f074924625cf966a87d3fcca44d989 100644 (file)
--- 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 7cc821d6b6e66e4f78e8be1a4058731fc1a917d8..18991014585dc95a1543a4f0c16ac830f00c20a9 100644 (file)
--- 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 f4cd85b0149b7370a60b640596b690544bdf5197..0c23244b5a2f66109fd4afddfea96e616b0e1530 100644 (file)
--- 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 d365afcedda196f92bee227eb339f7c1b2eea6dc..76e9edbb321bb789734e6d904603797d57bec437 100644 (file)
--- 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 1c614e0c79b1c17ee8fc8514c945b1b593a2f150..9fbb84d2370deac3a128413fef9661406fefb08f 100644 (file)
--- 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 38a232bfefe7673b9f3ac516c94db7de7788dc5f..d57844520f62503781ab25d85f38f86e738345c1 100644 (file)
--- 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 061b2ccbfe0e487ae9e88a37436a5c44aff48759..f8e9ed949da0b84707d7469b8d0a90b92b623b0d 100644 (file)
--- 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