Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / kernel / rwsem.c

diff --git a/kernel/rwsem.c b/kernel/rwsem.c
index 291ded556aa034fffb7bf7c25799e9d7bb95eaf2..9a87886b022eb42ab486cd4749a5da1043a91c36 100644 (file)
--- a/kernel/rwsem.c
+++ b/kernel/rwsem.c
@@ -60,7 +60,7 @@ int down_write_trylock(struct rw_semaphore *sem)
        int ret = __down_write_trylock(sem);
 
        if (ret == 1)
-               rwsem_acquire(&sem->dep_map, 0, 0, _RET_IP_);
+               rwsem_acquire(&sem->dep_map, 0, 1, _RET_IP_);
        return ret;
 }