X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fuuid.h;h=d8ac53d33134995aa335f29b5c4cffbfc3632ed4;hb=7c6d929d62a6e24fb1dbeaee5cd2c8afe77720b7;hp=b118b3652712247087e012db9469e5897cd34879;hpb=a90917c3f8c4ed79117f1caa333b29a2108084ec;p=lttng-modules.git

diff --git a/wrapper/uuid.h b/wrapper/uuid.h
index b118b365..d8ac53d3 100644
--- a/wrapper/uuid.h
+++ b/wrapper/uuid.h
@@ -1,29 +1,31 @@
-#ifndef _LTTNG_WRAPPER_UUID_H
-#define _LTTNG_WRAPPER_UUID_H
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * wrapper/uuid.h
+ *
+ * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <linux/version.h>
+#ifndef _LTTNG_WRAPPER_UUID_H
+#define _LTTNG_WRAPPER_UUID_H
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#include <linux/version.h>
 #include <linux/uuid.h>
-#else
 
-#include <linux/random.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0))
+static inline
+void lttng_guid_gen(guid_t *u)
+{
+	return guid_gen(u);
+}
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */
 
-typedef struct {
-	__u8 b[16];
-} uuid_le;
+typedef uuid_le guid_t;
 
 static inline
-void uuid_le_gen(uuid_le *u)
+void lttng_guid_gen(guid_t *u)
 {
-	generate_random_uuid(u->b);
+	return uuid_le_gen(u);
 }
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */
 
-#endif
 #endif /* _LTTNG_WRAPPER_UUID_H */