diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-arm/semaphore.h | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-arm/semaphore.h')
| -rw-r--r-- | include/asm-arm/semaphore.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h index 3186aac19..287d8c263 100644 --- a/include/asm-arm/semaphore.h +++ b/include/asm-arm/semaphore.h @@ -18,10 +18,11 @@ struct semaphore { #define MUTEX_LOCKED ((struct semaphore) { ATOMIC_INIT(0), 0, NULL }) asmlinkage void __down_failed (void /* special register calling convention */); -asmlinkage int __down_failed_interruptible (void /* special register calling convention */); +asmlinkage int __down_interruptible_failed (void /* special register calling convention */); asmlinkage void __up_wakeup (void /* special register calling convention */); extern void __down(struct semaphore * sem); +extern int __down_interruptible(struct semaphore * sem); extern void __up(struct semaphore * sem); #define sema_init(sem, val) atomic_set(&((sem)->count), (val)) @@ -47,7 +48,7 @@ static inline void wake_one_more(struct semaphore * sem) restore_flags(flags); } -static inline int waking_non_zero(struct semaphore *sem) +static inline int waking_non_zero(struct semaphore *sem, struct task_struct *tsk) { unsigned long flags; int ret = 0; |