Merge branch 'linus' into core/urgent

[linux-2.6-block.git] / include / linux / mutex.h

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index a940fe435acac1e6b48774686cdd39c9f0cd652d..9121595a8ebfe14a1d2330c79454f4b53a088669 100644 (file)
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -15,7 +15,7 @@
 #include <linux/linkage.h>
 #include <linux/lockdep.h>
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /*
  * Simple, straightforward mutexes with strict semantics:
@@ -92,7 +92,7 @@ do {                                                  \
                                                        \
        __mutex_init((mutex), #mutex, &__key);          \
 } while (0)
-# define mutex_destroy(mutex)                          do { } while (0)
+static inline void mutex_destroy(struct mutex *lock) {}
 #endif
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC