summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2006-11-27 00:56:56 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-27 01:30:29 +0100
commitc9c3b86f2ab79f7f6e87eb735f9cc4508b73fc48 (patch)
treec48d98c329a892d19dbac47997be4d8e972ada3f /include
parentRevert "[PATCH] Enforce "unsigned long flags;" when spinlocking" (diff)
downloadlinux-c9c3b86f2ab79f7f6e87eb735f9cc4508b73fc48.tar.xz
linux-c9c3b86f2ab79f7f6e87eb735f9cc4508b73fc48.zip
[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: Kyle McMartin <kyle@parisc-linux.org> [ And I already removed gthe BUILD_BUG_ON() in the previous commit ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-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);