Handle newer 3.1+ perf API

[lttng-modules.git] / wrapper / spinlock.h

diff --git a/wrapper/spinlock.h b/wrapper/spinlock.h
index af00ef2879e2b8043e255ad5feb7828ce5b0afa0..8b1ad992559590a31c0be4ce3e8476bdd510f020 100644 (file)
--- a/wrapper/spinlock.h
+++ b/wrapper/spinlock.h
@@ -11,12 +11,15 @@
 
 #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