diff options
| author | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
| commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
| tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /include/linux/mutex.h | |
| parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
| download | lwn-ddae9c2ea79449beb00027cf77fca6dc489f2d15.tar.gz lwn-ddae9c2ea79449beb00027cf77fca6dc489f2d15.zip | |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'include/linux/mutex.h')
| -rw-r--r-- | include/linux/mutex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 9bce0fee68d4..f1ac507fa20d 100644 --- 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) \ |