Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[pandora-kernel.git] / include / linux / mutex.h

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 9bce0fe..f1ac507 100644 (file)
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -12,6 +12,7 @@
 
 #include <linux/list.h>
 #include <linux/spinlock_types.h>
+#include <linux/linkage.h>
 
 #include <asm/atomic.h>
 
@@ -78,7 +79,7 @@ struct mutex_waiter {
 # define mutex_debug_show_all_locks()                  do { } while (0)
 # define mutex_debug_show_held_locks(p)                        do { } while (0)
 # define mutex_debug_check_no_locks_held(task)         do { } while (0)
-# define mutex_debug_check_no_locks_freed(from, to)    do { } while (0)
+# define mutex_debug_check_no_locks_freed(from, len)   do { } while (0)
 #endif
 
 #define __MUTEX_INITIALIZER(lockname) \