diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:29:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:29:06 -0400 |
| commit | d4a47ac15487ee855386e414bf51435d83cd1812 (patch) | |
| tree | 86700cde504bf6f345da8c76201fe20e785f4337 | |
| parent | aa9f56b66d278aba2f278c75761b7e19fbaca97a (diff) | |
| parent | b680f0979ff571836f3616dfca727b516bcc5d3d (diff) | |
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] Fix rwsem: RWSEM_WAITING_BIAS must not be unsigned.
| -rw-r--r-- | arch/ia64/include/asm/rwsem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h index e8762688e8e3..215d5454c7d3 100644 --- a/arch/ia64/include/asm/rwsem.h +++ b/arch/ia64/include/asm/rwsem.h | |||
| @@ -40,9 +40,9 @@ struct rw_semaphore { | |||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | #define RWSEM_UNLOCKED_VALUE __IA64_UL_CONST(0x0000000000000000) | 42 | #define RWSEM_UNLOCKED_VALUE __IA64_UL_CONST(0x0000000000000000) |
| 43 | #define RWSEM_ACTIVE_BIAS __IA64_UL_CONST(0x0000000000000001) | 43 | #define RWSEM_ACTIVE_BIAS (1L) |
| 44 | #define RWSEM_ACTIVE_MASK __IA64_UL_CONST(0x00000000ffffffff) | 44 | #define RWSEM_ACTIVE_MASK (0xffffffffL) |
| 45 | #define RWSEM_WAITING_BIAS -__IA64_UL_CONST(0x0000000100000000) | 45 | #define RWSEM_WAITING_BIAS (-0x100000000L) |
| 46 | #define RWSEM_ACTIVE_READ_BIAS RWSEM_ACTIVE_BIAS | 46 | #define RWSEM_ACTIVE_READ_BIAS RWSEM_ACTIVE_BIAS |
| 47 | #define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS) | 47 | #define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS) |
| 48 | 48 | ||