aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/mutex.c
diff options
context:
space:
mode:
authorNathan Scott <nathans@bruce>2006-01-11 21:34:47 -0500
committerNathan Scott <nathans@bruce>2006-01-11 21:34:47 -0500
commitddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch)
tree047c2d7c8d6cbb0721f017514e1d83a20e278d43 /kernel/mutex.c
parent0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff)
parenta4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff)
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'kernel/mutex.c')
-rw-r--r--kernel/mutex.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 5c2561844196..5449b210d9ed 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -202,7 +202,7 @@ __mutex_lock_slowpath(atomic_t *lock_count __IP_DECL__)
202static fastcall noinline void 202static fastcall noinline void
203__mutex_unlock_slowpath(atomic_t *lock_count __IP_DECL__) 203__mutex_unlock_slowpath(atomic_t *lock_count __IP_DECL__)
204{ 204{
205 struct mutex *lock = container_of(lock_count, struct mutex, count); 205 struct mutex *lock = container_of(lock_count, struct mutex, count);
206 206
207 DEBUG_WARN_ON(lock->owner != current_thread_info()); 207 DEBUG_WARN_ON(lock->owner != current_thread_info());
208 208
@@ -313,6 +313,3 @@ int fastcall mutex_trylock(struct mutex *lock)
313} 313}
314 314
315EXPORT_SYMBOL(mutex_trylock); 315EXPORT_SYMBOL(mutex_trylock);
316
317
318