diff options
author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-17 21:51:42 -0500 |
commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /kernel/mutex-debug.c | |
parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'kernel/mutex-debug.c')
-rw-r--r-- | kernel/mutex-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c index d17436cdea1b..3aaa06c561de 100644 --- a/kernel/mutex-debug.c +++ b/kernel/mutex-debug.c | |||
@@ -107,7 +107,7 @@ void debug_mutex_init(struct mutex *lock, const char *name, | |||
107 | * use of the mutex is forbidden. The mutex must not be locked when | 107 | * use of the mutex is forbidden. The mutex must not be locked when |
108 | * this function is called. | 108 | * this function is called. |
109 | */ | 109 | */ |
110 | void fastcall mutex_destroy(struct mutex *lock) | 110 | void mutex_destroy(struct mutex *lock) |
111 | { | 111 | { |
112 | DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock)); | 112 | DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock)); |
113 | lock->magic = NULL; | 113 | lock->magic = NULL; |