Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4a47ac1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents aa9f56b6 b680f097

arch/ia64/include/asm/rwsem.h

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ struct rw_semaphore { 
};



#define RWSEM_UNLOCKED_VALUE		__IA64_UL_CONST(0x0000000000000000)

#define RWSEM_ACTIVE_BIAS		__IA64_UL_CONST(0x0000000000000001)

#define RWSEM_ACTIVE_MASK		__IA64_UL_CONST(0x00000000ffffffff)

#define RWSEM_WAITING_BIAS		-__IA64_UL_CONST(0x0000000100000000)

#define RWSEM_ACTIVE_BIAS		(1L)

#define RWSEM_ACTIVE_MASK		(0xffffffffL)

#define RWSEM_WAITING_BIAS		(-0x100000000L)

#define RWSEM_ACTIVE_READ_BIAS		RWSEM_ACTIVE_BIAS

#define RWSEM_ACTIVE_WRITE_BIAS		(RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)