[lttng-dev] [PATCH 08/11] lttng: remove uuid wrapper

[Mathieu Desnoyers]

Now that LTTng is in the kernel tree, we don't need to provide support
for older kernel versions.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
---
 drivers/staging/lttng/ltt-events.c   |    2 +-
 drivers/staging/lttng/ltt-events.h   |    3 ++-
 drivers/staging/lttng/wrapper/uuid.h |   29 -----------------------------
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 drivers/staging/lttng/wrapper/uuid.h

diff --git a/drivers/staging/lttng/ltt-events.c b/drivers/staging/lttng/ltt-events.c
index de1372c..60ff250 100644
--- a/drivers/staging/lttng/ltt-events.c
+++ b/drivers/staging/lttng/ltt-events.c
@@ -14,7 +14,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/jiffies.h>
-#include "wrapper/uuid.h"
+#include <linux/uuid.h>
 #include "ltt-events.h"
 #include "ltt-tracer.h"
 
diff --git a/drivers/staging/lttng/ltt-events.h b/drivers/staging/lttng/ltt-events.h
index c370ca6..a55e390 100644
--- a/drivers/staging/lttng/ltt-events.h
+++ b/drivers/staging/lttng/ltt-events.h
@@ -13,7 +13,8 @@
 
 #include <linux/list.h>
 #include <linux/kprobes.h>
-#include "wrapper/uuid.h"
+#include <linux/uuid.h>
+#include <linux/version.h>
 #include "ltt-debugfs-abi.h"
 
 #undef is_signed_type
diff --git a/drivers/staging/lttng/wrapper/uuid.h b/drivers/staging/lttng/wrapper/uuid.h
deleted file mode 100644
index bfa67ff..0000000
--- a/drivers/staging/lttng/wrapper/uuid.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _LTT_WRAPPER_UUID_H
-#define _LTT_WRAPPER_UUID_H
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers at efficios.com)
- *
- * Dual LGPL v2.1/GPL v2 license.
- */
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
-#include <linux/uuid.h>
-#else
-
-#include <linux/random.h>
-
-typedef struct {
-	__u8 b[16];
-} uuid_le;
-
-static inline
-void uuid_le_gen(uuid_le *u)
-{
-	generate_random_uuid(u->b);
-}
-
-#endif
-#endif /* _LTT_WRAPPER_UUID_H */
-- 
1.7.5.4