From: Andrew Morton bah. Cc: Steven Rostedt Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- Documentation/rt-mutex.txt | 2 +- kernel/rtmutex.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN Documentation/rt-mutex.txt~document-futex-pi-design-fix-fix Documentation/rt-mutex.txt --- devel/Documentation/rt-mutex.txt~document-futex-pi-design-fix-fix 2006-05-17 22:52:22.000000000 -0700 +++ devel-akpm/Documentation/rt-mutex.txt 2006-05-17 22:52:47.000000000 -0700 @@ -76,4 +76,4 @@ task [because at unlock time we always a (*) The "mutex has waiters" bit gets set to take the lock. If the lock doesn't already have an owner, this bit is quickly cleared if there are no waiters. So this is a transitional state to synchronize with looking -at the owner field of the mutex and the mutex owner releasing the lock. \ No newline at end of file +at the owner field of the mutex and the mutex owner releasing the lock. diff -puN kernel/rtmutex.c~document-futex-pi-design-fix-fix kernel/rtmutex.c --- devel/kernel/rtmutex.c~document-futex-pi-design-fix-fix 2006-05-17 22:52:22.000000000 -0700 +++ devel-akpm/kernel/rtmutex.c 2006-05-17 22:52:22.000000000 -0700 @@ -54,7 +54,7 @@ * state. */ -static vid +static void rt_mutex_set_owner(struct rt_mutex *lock, struct task_struct *owner, unsigned long mask) { _