Merge branch 'upstream-merged'

1 files changed, 19 insertions, 0 deletions

diff --git a/libdde-linux26/libdde_linux26/contrib/include/asm-generic/mutex-null.h b/libdde-linux26/libdde_linux26/contrib/include/asm-generic/mutex-null.h
new file mode 100644
index 00000000..e1bbbc72
--- /dev/null
+++ b/libdde-linux26/libdde_linux26/contrib/include/asm-generic/mutex-null.h
@@ -0,0 +1,19 @@
+/*
+ * include/asm-generic/mutex-null.h
+ *
+ * Generic implementation of the mutex fastpath, based on NOP :-)
+ *
+ * This is used by the mutex-debugging infrastructure, but it can also
+ * be used by architectures that (for whatever reason) want to use the
+ * spinlock based slowpath.
+ */
+#ifndef _ASM_GENERIC_MUTEX_NULL_H
+#define _ASM_GENERIC_MUTEX_NULL_H
+
+#define __mutex_fastpath_lock(count, fail_fn)		fail_fn(count)
+#define __mutex_fastpath_lock_retval(count, fail_fn)	fail_fn(count)
+#define __mutex_fastpath_unlock(count, fail_fn)		fail_fn(count)
+#define __mutex_fastpath_trylock(count, fail_fn)	fail_fn(count)
+#define __mutex_slowpath_needs_to_unlock()		1
+
+#endif