X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=wrapper%2Fspinlock.h;h=db46da38f9b41b4db1eb655740704335e79f0350;hb=360d3efee55154a55c18be32175bee608dcb21df;hp=147ace927574d7a01877fc4eb2eaf3d2f85810f0;hpb=a90917c3f8c4ed79117f1caa333b29a2108084ec;p=lttng-modules.git

diff --git a/wrapper/spinlock.h b/wrapper/spinlock.h
index 147ace92..db46da38 100644
--- a/wrapper/spinlock.h
+++ b/wrapper/spinlock.h
@@ -2,14 +2,28 @@
 #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>
+#include <lttng-kernel-version.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(2,6,33))
 
 #include <linux/string.h>
 
@@ -21,6 +35,13 @@
 
 #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 /* _LTTNG_WRAPPER_SPINLOCK_H */