diff --git a/[refs] b/[refs] index 4d8c72b33441..cba651472a71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4de151d8cd2553e7e89044ab5d72fcad4eb04afb +refs/heads/master: 7ad4a5d56874b37ad24d89aae2f8d192ba7b1521 diff --git a/trunk/Documentation/spinlocks.txt b/trunk/Documentation/spinlocks.txt index c2122996631e..a661d684768e 100644 --- a/trunk/Documentation/spinlocks.txt +++ b/trunk/Documentation/spinlocks.txt @@ -9,7 +9,7 @@ removed soon. So for any new code dynamic initialization should be used: static int __init xxx_init(void) { spin_lock_init(&xxx_lock); - rw_lock_init(&xxx_rw_lock); + rwlock_init(&xxx_rw_lock); ... }