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

Commit c9c3b86f authored by Kyle McMartin's avatar Kyle McMartin Committed by Linus Torvalds
Browse files

[PATCH] Fix incorrent type of flags in <asm/semaphore.h> 



I still think using BUILD_BUG_ON() is unacceptable, especially given how
vague the error message was.

Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
[ And I already removed gthe BUILD_BUG_ON() in the previous commit ]
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b8e6ec86

include/asm-parisc/semaphore.h

+4 −2
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ extern __inline__ int down_interruptible(struct semaphore * sem) 
 */

extern __inline__ int down_trylock(struct semaphore * sem)

{

	int flags, count;

	unsigned long flags;

	int count;



	spin_lock_irqsave(&sem->sentry, flags);

	count = sem->count - 1;
@@ -131,7 +132,8 @@ extern __inline__ int down_trylock(struct semaphore * sem) 
 */

extern __inline__ void up(struct semaphore * sem)

{

	int flags;

	unsigned long flags;



	spin_lock_irqsave(&sem->sentry, flags);

	if (sem->count < 0) {

		__up(sem);