git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-parisc
/
semaphore.h
diff --git
a/include/asm-parisc/semaphore.h
b/include/asm-parisc/semaphore.h
index
c9ee41c
..
d45827a
100644
(file)
--- 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)
{
*/
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;
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)
{
*/
extern __inline__ void up(struct semaphore * sem)
{
- int flags;
+ unsigned long flags;
+
spin_lock_irqsave(&sem->sentry, flags);
if (sem->count < 0) {
__up(sem);
spin_lock_irqsave(&sem->sentry, flags);
if (sem->count < 0) {
__up(sem);