X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fuuid.h;h=7c334947689f21aaeddf2516d1b23ad10afc17ef;hb=30af52f55ef4bd29cf2da9960517095780792839;hp=b85024f6906ee4f26975fef8ceacbd1ce3ea4312;hpb=82e64e8bc14841ffebb350f811e907d17bc46946;p=lttng-modules.git

diff --git a/wrapper/uuid.h b/wrapper/uuid.h
index b85024f6..7c334947 100644
--- a/wrapper/uuid.h
+++ b/wrapper/uuid.h
@@ -1,29 +1,31 @@
-#ifndef _LTT_WRAPPER_UUID_H
-#define _LTT_WRAPPER_UUID_H
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
+ * wrapper/uuid.h
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * 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 <lttng-kernel-version.h>
 #include <linux/uuid.h>
-#else
 
-#include <linux/random.h>
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0))
+static inline
+void lttng_guid_gen(guid_t *u)
+{
+	return guid_gen(u);
+}
+#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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);
+	return uuid_le_gen(u);
 }
+#endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,7,0)) */
 
-#endif
-#endif /* _LTT_WRAPPER_UUID_H */
+#endif /* _LTTNG_WRAPPER_UUID_H */