X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=wrapper%2Fspinlock.h;h=bc71b4f4b0df8320c43f4f8c79e3f81489130639;hb=refs%2Fheads%2Fstable-2.1;hp=af00ef2879e2b8043e255ad5feb7828ce5b0afa0;hpb=a181050f402c41239e5537b89c66e0349af65d61;p=lttng-modules.git

diff --git a/wrapper/spinlock.h b/wrapper/spinlock.h
index af00ef28..bc71b4f4 100644
--- a/wrapper/spinlock.h
+++ b/wrapper/spinlock.h
@@ -1,23 +1,47 @@
-#ifndef _LTT_WRAPPER_SPINLOCK_H
-#define _LTT_WRAPPER_SPINLOCK_H
+#ifndef _LTTNG_WRAPPER_SPINLOCK_H
+#define _LTTNG_WRAPPER_SPINLOCK_H
 
 /*
- * Copyright (C) 2011 Mathieu Desnoyers (mathieu.desnoyers@efficios.com)
+ * wrapper/spinlock.h
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #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 */