diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 21:44:43 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 21:44:43 +0300 |
| commit | d8bef0bb219154e655fa139e28400d6ae9aa3727 (patch) | |
| tree | 44ec9d752831c5fe6bc7ad1208febe0bf19b8996 /arch/ia64/include/asm/rwsem.h | |
| parent | 37c24b37fb2454e95136139d10bb6828967105bf (diff) | |
| parent | 430677133fd5a2033222b3b5016bb461fe8fabf2 (diff) | |
| download | linux-d8bef0bb219154e655fa139e28400d6ae9aa3727.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] implement early_io{re,un}map for ia64
[IA64] Replace old style lock initializer
[IA64] fix SBA IOMMU to handle allocation failure properly
[IA64] Save I-resources to ia64_sal_os_state
[IA64] preallocate IA64_IRQ_MOVE_VECTOR
Diffstat (limited to 'arch/ia64/include/asm/rwsem.h')
| -rw-r--r-- | arch/ia64/include/asm/rwsem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h index fbee74b15782..e8762688e8e3 100644 --- a/arch/ia64/include/asm/rwsem.h +++ b/arch/ia64/include/asm/rwsem.h @@ -47,7 +47,7 @@ struct rw_semaphore { #define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS) #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) } #define DECLARE_RWSEM(name) \ |