aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2006-11-29 14:24:16 +0100
committerAdrian Bunk <bunk@stusta.de>2006-11-29 14:24:16 +0100
commite2d1cbdc705c8b9d66831c1b81cea8c2cfabca10 (patch)
tree8b6ad7b0d1112df7a446e30c5b51b0d3f11d0fc8
parent190492c8f861547c94109175186bf83d89898e42 (diff)
downloadlinux-linaro-stable-e2d1cbdc705c8b9d66831c1b81cea8c2cfabca10.tar.gz
Fix incorrent type of flags in <asm/semaphore.h>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--include/asm-parisc/semaphore.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-parisc/semaphore.h b/include/asm-parisc/semaphore.h
index c9ee41cd0707..d45827a21f94 100644
--- a/include/asm-parisc/semaphore.h
+++ b/include/asm-parisc/semaphore.h
@@ -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);