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

diff --git a/wrapper/spinlock.h b/wrapper/spinlock.h
index af00ef28..147ace92 100644
--- a/wrapper/spinlock.h
+++ b/wrapper/spinlock.h
@@ -1,5 +1,5 @@
-#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)
@@ -11,13 +11,16 @@
 
 #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)
 
 
 #endif
-#endif /* _LTT_WRAPPER_SPINLOCK_H */
+#endif /* _LTTNG_WRAPPER_SPINLOCK_H */