lkml.org 
[lkml]   [2010]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 30/30] semaphore: Remove mutex emulation
    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>

    ---
    include/linux/semaphore.h | 6 ------
    scripts/checkpatch.pl | 8 ++------
    2 files changed, 2 insertions(+), 12 deletions(-)

    Index: linux-2.6/include/linux/semaphore.h
    ===================================================================
    --- linux-2.6.orig/include/linux/semaphore.h
    +++ linux-2.6/include/linux/semaphore.h
    @@ -29,9 +29,6 @@ struct semaphore {
    #define DEFINE_SEMAPHORE(name) \
    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 struct lock_class_key __key;
    @@ -39,9 +36,6 @@ static inline void sema_init(struct sema
    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 int __must_check down_interruptible(struct semaphore *sem);
    extern int __must_check down_killable(struct semaphore *sem);
    Index: linux-2.6/scripts/checkpatch.pl
    ===================================================================
    --- linux-2.6.orig/scripts/checkpatch.pl
    +++ linux-2.6/scripts/checkpatch.pl
    @@ -2701,12 +2701,8 @@ sub process {
    WARN("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr);
    }

    -# check for semaphores used as mutexes
    - if ($line =~ /^.\s*(DECLARE_MUTEX|init_MUTEX)\s*\(/) {
    - WARN("mutexes are preferred for single holder semaphores\n" . $herecurr);
    - }
    -# check for semaphores used as mutexes
    - if ($line =~ /^.\s*init_MUTEX_LOCKED\s*\(/) {
    +# check for semaphores initialized locked
    + if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
    WARN("consider using a completion\n" . $herecurr);

    }



    \
     
     \ /
      Last update: 2010-09-07 16:51    [W:0.053 / U:0.212 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site