X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=wrapper%2Fspinlock.h;h=b3570d4080b0ceed82df1a99541bec2c164717c6;hb=c6b2e60db40fdc2d116620ee6fbc103c12b72933;hp=af00ef2879e2b8043e255ad5feb7828ce5b0afa0;hpb=a181050f402c41239e5537b89c66e0349af65d61;p=lttng-modules.git

diff --git a/wrapper/spinlock.h b/wrapper/spinlock.h
index af00ef28..b3570d40 100644
--- a/wrapper/spinlock.h
+++ b/wrapper/spinlock.h
@@ -1,23 +1,34 @@
-#ifndef _LTT_WRAPPER_SPINLOCK_H
-#define _LTT_WRAPPER_SPINLOCK_H
-
-/*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
+ *
+ * wrapper/spinlock.h
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
+#ifndef _LTTNG_WRAPPER_SPINLOCK_H
+#define _LTTNG_WRAPPER_SPINLOCK_H
+
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
 
-#define raw_spin_lock_init(lock)				\
-	do {							\
-		*(lock) = __RAW_SPIN_LOCK_UNLOCKED(lock);	\
+#include <linux/string.h>
+
+#define raw_spin_lock_init(lock)					\
+	do {								\
+		raw_spinlock_t __lock = __RAW_SPIN_LOCK_UNLOCKED;	\
+		memcpy(lock, &__lock, sizeof(lock));			\
 	} while (0)
 
-#define raw_spin_is_locked(lock)	spin_is_locked(lock)
+#define raw_spin_is_locked(lock)	__raw_spin_is_locked(lock)
+
+#define wrapper_desc_spin_lock(lock)	spin_lock(lock)
+#define wrapper_desc_spin_unlock(lock)	spin_unlock(lock)
+
+#else
 
+#define wrapper_desc_spin_lock(lock)	raw_spin_lock(lock)
+#define wrapper_desc_spin_unlock(lock)	raw_spin_unlock(lock)
 
 #endif
-#endif /* _LTT_WRAPPER_SPINLOCK_H */
+#endif /* _LTTNG_WRAPPER_SPINLOCK_H */