iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

semaphore: Remove mutex emulation

Browse Source 
Semaphores used as mutexes have been deprecated for years. Now that
all users are either converted to real semaphores or to mutexes remove
the cruft.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Christoph Hellwig <hch@infradead.org>
LKML-Reference: <20100907125057.562399240@linutronix.de>
This commit is contained in:
Thomas Gleixner 2010-09-07 14:34:01 +00:00
parent 45f4d02435
commit 4882720b26
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/semaphore.h
View File

@ -29,9 +29,6 @@ struct semaphore {
#define DEFINE_SEMAPHORE(name) \ #define DEFINE_SEMAPHORE(name) \
struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1) struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1)
#define DECLARE_MUTEX(name) \
struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1)
static inline void sema_init(struct semaphore *sem, int val) static inline void sema_init(struct semaphore *sem, int val)
{ {
static struct lock_class_key __key; static struct lock_class_key __key;
@ -39,9 +36,6 @@ static inline void sema_init(struct semaphore *sem, int val)
lockdep_init_map(&sem->lock.dep_map, "semaphore->lock", &__key, 0); lockdep_init_map(&sem->lock.dep_map, "semaphore->lock", &__key, 0);
} }
#define init_MUTEX(sem) sema_init(sem, 1)
#define init_MUTEX_LOCKED(sem) sema_init(sem, 0)
extern void down(struct semaphore *sem); extern void down(struct semaphore *sem);
extern int __must_check down_interruptible(struct semaphore *sem); extern int __must_check down_interruptible(struct semaphore *sem);
extern int __must_check down_killable(struct semaphore *sem); extern int __must_check down_killable(struct semaphore *sem);

8
scripts/checkpatch.pl
View File

@ -2794,12 +2794,8 @@ sub process {
WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr); WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr);
} }
# check for semaphores used as mutexes # check for semaphores initialized locked
if ($line =~ /^.\s*(DECLARE_MUTEX|init_MUTEX)\s*\(/) { if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
WARN("mutexes are preferred for single holder semaphores\n" . $herecurr);
}
# check for semaphores used as mutexes
if ($line =~ /^.\s*init_MUTEX_LOCKED\s*\(/) {
WARN("consider using a completion\n" . $herecurr); WARN("consider using a completion\n" . $herecurr);
} }