Commit-ID: 6afef2b0a75ecdd2cf9da14f45b75aefb27541b0 Gitweb: http://git.kernel.org/tip/6afef2b0a75ecdd2cf9da14f45b75aefb27541b0 Author: David Kilroy <kilroyd@xxxxxxxxxxxxxx> AuthorDate: Fri, 18 Sep 2009 12:57:08 -0700 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Sun, 20 Sep 2009 20:14:44 +0200 spinlocks: Check spinlock_t/rwlock_t argument type on non-SMP builds When writing code for UP without CONFIG_DEBUG_SPINLOCK it's easy to get the first argument to the spinlock/rwlock functions wrong. This is because the parameter is not actually used in this configuration. Typically you will only find out it's wrong: * by rebuilding with CONFIG_SMP or CONFIG_DEBUG_SPINLOCK * after you've submitted your beautiful patch series. The first means a long wait, and the latter is a bit late. Change the intermediate macros into inline functions. Signed-off-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- include/linux/spinlock.h | 6 +- include/linux/spinlock_api_up.h | 118 +++++++++++++++++++++++++++++---------- 2 files changed, 92 insertions(+), 32 deletions(-) diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index f0ca7a7..178448a 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -240,17 +240,17 @@ static inline void smp_mb__after_lock(void) { smp_mb(); } #define spin_lock_irqsave(lock, flags) \ do { \ typecheck(unsigned long, flags); \ - _spin_lock_irqsave(lock, flags); \ + _spin_lock_irqsave(lock, &flags); \ } while (0) #define read_lock_irqsave(lock, flags) \ do { \ typecheck(unsigned long, flags); \ - _read_lock_irqsave(lock, flags); \ + _read_lock_irqsave(lock, &flags); \ } while (0) #define write_lock_irqsave(lock, flags) \ do { \ typecheck(unsigned long, flags); \ - _write_lock_irqsave(lock, flags); \ + _write_lock_irqsave(lock, &flags); \ } while (0) #define spin_lock_irqsave_nested(lock, flags, subclass) \ spin_lock_irqsave(lock, flags) diff --git a/include/linux/spinlock_api_up.h b/include/linux/spinlock_api_up.h index 04e1d31..432d4b6 100644 --- a/include/linux/spinlock_api_up.h +++ b/include/linux/spinlock_api_up.h @@ -48,34 +48,94 @@ #define __UNLOCK_IRQRESTORE(lock, flags) \ do { local_irq_restore(flags); __UNLOCK(lock); } while (0) -#define _spin_lock(lock) __LOCK(lock) -#define _spin_lock_nested(lock, subclass) __LOCK(lock) -#define _read_lock(lock) __LOCK(lock) -#define _write_lock(lock) __LOCK(lock) -#define _spin_lock_bh(lock) __LOCK_BH(lock) -#define _read_lock_bh(lock) __LOCK_BH(lock) -#define _write_lock_bh(lock) __LOCK_BH(lock) -#define _spin_lock_irq(lock) __LOCK_IRQ(lock) -#define _read_lock_irq(lock) __LOCK_IRQ(lock) -#define _write_lock_irq(lock) __LOCK_IRQ(lock) -#define _spin_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) -#define _read_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) -#define _write_lock_irqsave(lock, flags) __LOCK_IRQSAVE(lock, flags) -#define _spin_trylock(lock) ({ __LOCK(lock); 1; }) -#define _read_trylock(lock) ({ __LOCK(lock); 1; }) -#define _write_trylock(lock) ({ __LOCK(lock); 1; }) -#define _spin_trylock_bh(lock) ({ __LOCK_BH(lock); 1; }) -#define _spin_unlock(lock) __UNLOCK(lock) -#define _read_unlock(lock) __UNLOCK(lock) -#define _write_unlock(lock) __UNLOCK(lock) -#define _spin_unlock_bh(lock) __UNLOCK_BH(lock) -#define _write_unlock_bh(lock) __UNLOCK_BH(lock) -#define _read_unlock_bh(lock) __UNLOCK_BH(lock) -#define _spin_unlock_irq(lock) __UNLOCK_IRQ(lock) -#define _read_unlock_irq(lock) __UNLOCK_IRQ(lock) -#define _write_unlock_irq(lock) __UNLOCK_IRQ(lock) -#define _spin_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) -#define _read_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) -#define _write_unlock_irqrestore(lock, flags) __UNLOCK_IRQRESTORE(lock, flags) +static inline void _spin_lock(spinlock_t *lock) +{ __LOCK(lock); } + +static inline void _spin_lock_nested(spinlock_t *lock, int subclass) +{ __LOCK(lock); } + +static inline void _read_lock(rwlock_t *lock) +{ __LOCK(lock); } + +static inline void _write_lock(rwlock_t *lock) +{ __LOCK(lock); } + +static inline void _spin_lock_bh(spinlock_t *lock) +{ __LOCK_BH(lock); } + +static inline void _read_lock_bh(rwlock_t *lock) +{ __LOCK_BH(lock); } + +static inline void _write_lock_bh(rwlock_t *lock) +{ __LOCK_BH(lock); } + +static inline void _spin_lock_irq(spinlock_t *lock) +{ __LOCK_IRQ(lock); } + +static inline void _read_lock_irq(rwlock_t *lock) +{ __LOCK_IRQ(lock); } + +static inline void _write_lock_irq(rwlock_t *lock) +{ __LOCK_IRQ(lock); } + +static inline void _spin_lock_irqsave(spinlock_t *lock, unsigned long *flags) +{ __LOCK_IRQSAVE(lock, *flags); } + +static inline void _read_lock_irqsave(rwlock_t *lock, unsigned long *flags) +{ __LOCK_IRQSAVE(lock, *flags); } + +static inline void _write_lock_irqsave(rwlock_t *lock, unsigned long *flags) +{ __LOCK_IRQSAVE(lock, *flags); } + +static inline int _spin_trylock(spinlock_t *lock) +{ __LOCK(lock); return 1; } + +static inline int _read_trylock(rwlock_t *lock) +{ __LOCK(lock); return 1; } + +static inline int _write_trylock(rwlock_t *lock) +{ __LOCK(lock); return 1; } + +static inline int _spin_trylock_bh(spinlock_t *lock) +{ __LOCK_BH(lock); return 1; } + +static inline void _spin_unlock(spinlock_t *lock) +{ __UNLOCK(lock); } + +static inline void _read_unlock(rwlock_t *lock) +{ __UNLOCK(lock); } + +static inline void _write_unlock(rwlock_t *lock) +{ __UNLOCK(lock); } + +static inline void _spin_unlock_bh(spinlock_t *lock) +{ __UNLOCK_BH(lock); } + +static inline void _read_unlock_bh(rwlock_t *lock) +{ __UNLOCK_BH(lock); } + +static inline void _write_unlock_bh(rwlock_t *lock) +{ __UNLOCK_BH(lock); } + +static inline void _spin_unlock_irq(spinlock_t *lock) +{ __UNLOCK_IRQ(lock); } + +static inline void _read_unlock_irq(rwlock_t *lock) +{ __UNLOCK_IRQ(lock); } + +static inline void _write_unlock_irq(rwlock_t *lock) +{ __UNLOCK_IRQ(lock); } + +static inline void _spin_unlock_irqrestore(spinlock_t *lock, + unsigned long flags) +{ __UNLOCK_IRQRESTORE(lock, flags); } + +static inline void _read_unlock_irqrestore(rwlock_t *lock, + unsigned long flags) +{ __UNLOCK_IRQRESTORE(lock, flags); } + +static inline void _write_unlock_irqrestore(rwlock_t *lock, + unsigned long flags) +{ __UNLOCK_IRQRESTORE(lock, flags); } #endif /* __LINUX_SPINLOCK_API_UP_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html