diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 12:49:39 (GMT) |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-12-03 12:49:39 (GMT) |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/sh/include | |
| parent | 474b18ccc264c472abeec50f48469b6477202699 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| download | linux-fsl-qoriq-220d0b1dbf78c6417a658c96e571415552d3abac.tar.xz | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/rwsem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/rwsem.h b/arch/sh/include/asm/rwsem.h index 1987f3e..06e2251 100644 --- a/arch/sh/include/asm/rwsem.h +++ b/arch/sh/include/asm/rwsem.h @@ -41,7 +41,7 @@ struct rw_semaphore { #endif #define __RWSEM_INITIALIZER(name) \ - { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \ + { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \ LIST_HEAD_INIT((name).wait_list) \ __RWSEM_DEP_MAP_INIT(name) } |