From 41b597d1ce7bcc6d7e9d40ab2bb9e988ca43b54c Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Sun, 27 Jan 2008 19:52:33 -0500 Subject: [PATCH] m68knommu: Implement down_killable Signed-off-by: Matthew Wilcox --- arch/m68knommu/kernel/m68k_ksyms.c | 1 + arch/m68knommu/kernel/semaphore.c | 20 ++++++++++++++++++++ include/asm-m68knommu/semaphore-helper.h | 19 +++++++++++++++++++ include/asm-m68knommu/semaphore.h | 21 +++++++++++++++++++++ 4 files changed, 61 insertions(+), 0 deletions(-) diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c index f795062..6664c4a 100644 --- a/arch/m68knommu/kernel/m68k_ksyms.c +++ b/arch/m68knommu/kernel/m68k_ksyms.c @@ -52,6 +52,7 @@ EXPORT_SYMBOL(memmove); EXPORT_SYMBOL(__down_failed); EXPORT_SYMBOL(__down_failed_interruptible); +EXPORT_SYMBOL(__down_failed_killable); EXPORT_SYMBOL(__down_failed_trylock); EXPORT_SYMBOL(__up_wakeup); diff --git a/arch/m68knommu/kernel/semaphore.c b/arch/m68knommu/kernel/semaphore.c index bce2bc7..cbada4c 100644 --- a/arch/m68knommu/kernel/semaphore.c +++ b/arch/m68knommu/kernel/semaphore.c @@ -127,6 +127,26 @@ int __sched __down_interruptible(struct semaphore * sem) return ret; } +int __sched __down_killable(struct semaphore * sem) +{ + DECLARE_WAITQUEUE(wait, current); + int ret = 0; + + DOWN_HEAD(TASK_KILLABLE) + + ret = waking_non_zero_killable(sem, current); + if (ret) + { + if (ret == 1) + /* ret != 0 only if we get interrupted -arca */ + ret = 0; + break; + } + schedule(); + DOWN_TAIL(TASK_KILLABLE) + return ret; +} + int __down_trylock(struct semaphore * sem) { return waking_non_zero_trylock(sem); diff --git a/include/asm-m68knommu/semaphore-helper.h b/include/asm-m68knommu/semaphore-helper.h index 43da7bc..03e3439 100644 --- a/include/asm-m68knommu/semaphore-helper.h +++ b/include/asm-m68knommu/semaphore-helper.h @@ -58,6 +58,25 @@ static inline int waking_non_zero_interruptible(struct semaphore *sem, return ret; } +static inline int waking_non_zero_killable(struct semaphore *sem, + struct task_struct *tsk) +{ + int ret; + unsigned long flags; + + spin_lock_irqsave(&semaphore_wake_lock, flags); + ret = 0; + if (atomic_read(&sem->waking) > 0) { + atomic_dec(&sem->waking); + ret = 1; + } else if (fatal_signal_pending(tsk)) { + atomic_inc(&sem->count); + ret = -EINTR; + } + spin_unlock_irqrestore(&semaphore_wake_lock, flags); + return ret; +} + /* * waking_non_zero_trylock: * 1 failed to lock diff --git a/include/asm-m68knommu/semaphore.h b/include/asm-m68knommu/semaphore.h index 5779eb6..a70b904 100644 --- a/include/asm-m68knommu/semaphore.h +++ b/include/asm-m68knommu/semaphore.h @@ -57,11 +57,13 @@ static inline void init_MUTEX_LOCKED (struct semaphore *sem) asmlinkage void __down_failed(void /* special register calling convention */); asmlinkage int __down_failed_interruptible(void /* params in registers */); +asmlinkage int __down_failed_killable(void /* params in registers */); asmlinkage int __down_failed_trylock(void /* params in registers */); asmlinkage void __up_wakeup(void /* special register calling convention */); asmlinkage void __down(struct semaphore * sem); asmlinkage int __down_interruptible(struct semaphore * sem); +asmlinkage int __down_killable(struct semaphore * sem); asmlinkage int __down_trylock(struct semaphore * sem); asmlinkage void __up(struct semaphore * sem); @@ -106,6 +108,25 @@ static inline int down_interruptible(struct semaphore * sem) return(ret); } +static inline int down_killable(struct semaphore * sem) +{ + int ret; + + might_sleep(); + __asm__ __volatile__( + "| atomic killable down operation\n\t" + "movel %1, %%a1\n\t" + "lea %%pc@(1f), %%a0\n\t" + "subql #1, %%a1@\n\t" + "jmi __down_failed_killable\n\t" + "clrl %%d0\n" + "1: movel %%d0, %0\n" + : "=d" (ret) + : "g" (sem) + : "cc", "%d0", "%a0", "%a1", "memory"); + return(ret); +} + static inline int down_trylock(struct semaphore * sem) { register struct semaphore *sem1 __asm__ ("%a1") = sem; -- 1.5.3.8