lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

locking: Cleanup the name space completely

Browse Source 
Make the name space hierarchy of locking functions consistent:
     raw_spin* -> _raw_spin* -> __raw_spin*

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
2009-12-03 21:52:18 +01:00
parent 9828ea9d75
commit 9c1721aa49
6 changed files with 272 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
kernel/spinlock.c
View File

@ -44,7 +44,7 @@
* towards that other CPU that it should break the lock ASAP.
*/
#define BUILD_LOCK_OPS(op, locktype) \
void __lockfunc __##op##_lock(locktype##_t *lock) \
void __lockfunc __raw_##op##_lock(locktype##_t *lock) \
{ \
for (;;) { \
preempt_disable(); \
@ -60,7 +60,7 @@ void __lockfunc __##op##_lock(locktype##_t *lock) \
(lock)->break_lock = 0; \
} \
\
unsigned long __lockfunc __##op##_lock_irqsave(locktype##_t *lock) \
unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \
{ \
unsigned long flags; \
\
@ -81,12 +81,12 @@ unsigned long __lockfunc __##op##_lock_irqsave(locktype##_t *lock) \
return flags; \
} \
\
void __lockfunc __##op##_lock_irq(locktype##_t *lock) \
void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \
{ \
_##op##_lock_irqsave(lock); \
_raw_##op##_lock_irqsave(lock); \
} \
\
void __lockfunc __##op##_lock_bh(locktype##_t *lock) \
void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \
{ \
unsigned long flags; \
\
@ -95,7 +95,7 @@ void __lockfunc __##op##_lock_bh(locktype##_t *lock) \
/* irq-disabling. We use the generic preemption-aware */ \
/* function: */ \
/**/ \
flags = _##op##_lock_irqsave(lock); \
flags = _raw_##op##_lock_irqsave(lock); \
local_bh_disable(); \
local_irq_restore(flags); \
} \
@ -116,240 +116,240 @@ BUILD_LOCK_OPS(write, rwlock);
#endif
#ifndef CONFIG_INLINE_SPIN_TRYLOCK
int __lockfunc _spin_trylock(raw_spinlock_t *lock)
int __lockfunc _raw_spin_trylock(raw_spinlock_t *lock)
{
return __spin_trylock(lock);
return __raw_spin_trylock(lock);
}
EXPORT_SYMBOL(_spin_trylock);
EXPORT_SYMBOL(_raw_spin_trylock);
#endif
#ifndef CONFIG_INLINE_SPIN_TRYLOCK_BH
int __lockfunc _spin_trylock_bh(raw_spinlock_t *lock)
int __lockfunc _raw_spin_trylock_bh(raw_spinlock_t *lock)
{
return __spin_trylock_bh(lock);
return __raw_spin_trylock_bh(lock);
}
EXPORT_SYMBOL(_spin_trylock_bh);
EXPORT_SYMBOL(_raw_spin_trylock_bh);
#endif
#ifndef CONFIG_INLINE_SPIN_LOCK
void __lockfunc _spin_lock(raw_spinlock_t *lock)
void __lockfunc _raw_spin_lock(raw_spinlock_t *lock)
{
__spin_lock(lock);
__raw_spin_lock(lock);
}
EXPORT_SYMBOL(_spin_lock);
EXPORT_SYMBOL(_raw_spin_lock);
#endif
#ifndef CONFIG_INLINE_SPIN_LOCK_IRQSAVE
unsigned long __lockfunc _spin_lock_irqsave(raw_spinlock_t *lock)
unsigned long __lockfunc _raw_spin_lock_irqsave(raw_spinlock_t *lock)
{
return __spin_lock_irqsave(lock);
return __raw_spin_lock_irqsave(lock);
}
EXPORT_SYMBOL(_spin_lock_irqsave);
EXPORT_SYMBOL(_raw_spin_lock_irqsave);
#endif
#ifndef CONFIG_INLINE_SPIN_LOCK_IRQ
void __lockfunc _spin_lock_irq(raw_spinlock_t *lock)
void __lockfunc _raw_spin_lock_irq(raw_spinlock_t *lock)
{
__spin_lock_irq(lock);
__raw_spin_lock_irq(lock);
}
EXPORT_SYMBOL(_spin_lock_irq);
EXPORT_SYMBOL(_raw_spin_lock_irq);
#endif
#ifndef CONFIG_INLINE_SPIN_LOCK_BH
void __lockfunc _spin_lock_bh(raw_spinlock_t *lock)
void __lockfunc _raw_spin_lock_bh(raw_spinlock_t *lock)
{
__spin_lock_bh(lock);
__raw_spin_lock_bh(lock);
}
EXPORT_SYMBOL(_spin_lock_bh);
EXPORT_SYMBOL(_raw_spin_lock_bh);
#endif
#ifndef CONFIG_INLINE_SPIN_UNLOCK
void __lockfunc _spin_unlock(raw_spinlock_t *lock)
void __lockfunc _raw_spin_unlock(raw_spinlock_t *lock)
{
__spin_unlock(lock);
__raw_spin_unlock(lock);
}
EXPORT_SYMBOL(_spin_unlock);
EXPORT_SYMBOL(_raw_spin_unlock);
#endif
#ifndef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE
void __lockfunc _spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)
void __lockfunc _raw_spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)
{
__spin_unlock_irqrestore(lock, flags);
__raw_spin_unlock_irqrestore(lock, flags);
}
EXPORT_SYMBOL(_spin_unlock_irqrestore);
EXPORT_SYMBOL(_raw_spin_unlock_irqrestore);
#endif
#ifndef CONFIG_INLINE_SPIN_UNLOCK_IRQ
void __lockfunc _spin_unlock_irq(raw_spinlock_t *lock)
void __lockfunc _raw_spin_unlock_irq(raw_spinlock_t *lock)
{
__spin_unlock_irq(lock);
__raw_spin_unlock_irq(lock);
}
EXPORT_SYMBOL(_spin_unlock_irq);
EXPORT_SYMBOL(_raw_spin_unlock_irq);
#endif
#ifndef CONFIG_INLINE_SPIN_UNLOCK_BH
void __lockfunc _spin_unlock_bh(raw_spinlock_t *lock)
void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)
{
__spin_unlock_bh(lock);
__raw_spin_unlock_bh(lock);
}
EXPORT_SYMBOL(_spin_unlock_bh);
EXPORT_SYMBOL(_raw_spin_unlock_bh);
#endif
#ifndef CONFIG_INLINE_READ_TRYLOCK
int __lockfunc _read_trylock(rwlock_t *lock)
int __lockfunc _raw_read_trylock(rwlock_t *lock)
{
return __read_trylock(lock);
return __raw_read_trylock(lock);
}
EXPORT_SYMBOL(_read_trylock);
EXPORT_SYMBOL(_raw_read_trylock);
#endif
#ifndef CONFIG_INLINE_READ_LOCK
void __lockfunc _read_lock(rwlock_t *lock)
void __lockfunc _raw_read_lock(rwlock_t *lock)
{
__read_lock(lock);
__raw_read_lock(lock);
}
EXPORT_SYMBOL(_read_lock);
EXPORT_SYMBOL(_raw_read_lock);
#endif
#ifndef CONFIG_INLINE_READ_LOCK_IRQSAVE
unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
unsigned long __lockfunc _raw_read_lock_irqsave(rwlock_t *lock)
{
return __read_lock_irqsave(lock);
return __raw_read_lock_irqsave(lock);
}
EXPORT_SYMBOL(_read_lock_irqsave);
EXPORT_SYMBOL(_raw_read_lock_irqsave);
#endif
#ifndef CONFIG_INLINE_READ_LOCK_IRQ
void __lockfunc _read_lock_irq(rwlock_t *lock)
void __lockfunc _raw_read_lock_irq(rwlock_t *lock)
{
__read_lock_irq(lock);
__raw_read_lock_irq(lock);
}
EXPORT_SYMBOL(_read_lock_irq);
EXPORT_SYMBOL(_raw_read_lock_irq);
#endif
#ifndef CONFIG_INLINE_READ_LOCK_BH
void __lockfunc _read_lock_bh(rwlock_t *lock)
void __lockfunc _raw_read_lock_bh(rwlock_t *lock)
{
__read_lock_bh(lock);
__raw_read_lock_bh(lock);
}
EXPORT_SYMBOL(_read_lock_bh);
EXPORT_SYMBOL(_raw_read_lock_bh);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK
void __lockfunc _read_unlock(rwlock_t *lock)
void __lockfunc _raw_read_unlock(rwlock_t *lock)
{
__read_unlock(lock);
__raw_read_unlock(lock);
}
EXPORT_SYMBOL(_read_unlock);
EXPORT_SYMBOL(_raw_read_unlock);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
void __lockfunc _raw_read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
{
__read_unlock_irqrestore(lock, flags);
__raw_read_unlock_irqrestore(lock, flags);
}
EXPORT_SYMBOL(_read_unlock_irqrestore);
EXPORT_SYMBOL(_raw_read_unlock_irqrestore);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_IRQ
void __lockfunc _read_unlock_irq(rwlock_t *lock)
void __lockfunc _raw_read_unlock_irq(rwlock_t *lock)
{
__read_unlock_irq(lock);
__raw_read_unlock_irq(lock);
}
EXPORT_SYMBOL(_read_unlock_irq);
EXPORT_SYMBOL(_raw_read_unlock_irq);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_BH
void __lockfunc _read_unlock_bh(rwlock_t *lock)
void __lockfunc _raw_read_unlock_bh(rwlock_t *lock)
{
__read_unlock_bh(lock);
__raw_read_unlock_bh(lock);
}
EXPORT_SYMBOL(_read_unlock_bh);
EXPORT_SYMBOL(_raw_read_unlock_bh);
#endif
#ifndef CONFIG_INLINE_WRITE_TRYLOCK
int __lockfunc _write_trylock(rwlock_t *lock)
int __lockfunc _raw_write_trylock(rwlock_t *lock)
{
return __write_trylock(lock);
return __raw_write_trylock(lock);
}
EXPORT_SYMBOL(_write_trylock);
EXPORT_SYMBOL(_raw_write_trylock);
#endif
#ifndef CONFIG_INLINE_WRITE_LOCK
void __lockfunc _write_lock(rwlock_t *lock)
void __lockfunc _raw_write_lock(rwlock_t *lock)
{
__write_lock(lock);
__raw_write_lock(lock);
}
EXPORT_SYMBOL(_write_lock);
EXPORT_SYMBOL(_raw_write_lock);
#endif
#ifndef CONFIG_INLINE_WRITE_LOCK_IRQSAVE
unsigned long __lockfunc _write_lock_irqsave(rwlock_t *lock)
unsigned long __lockfunc _raw_write_lock_irqsave(rwlock_t *lock)
{
return __write_lock_irqsave(lock);
return __raw_write_lock_irqsave(lock);
}
EXPORT_SYMBOL(_write_lock_irqsave);
EXPORT_SYMBOL(_raw_write_lock_irqsave);
#endif
#ifndef CONFIG_INLINE_WRITE_LOCK_IRQ
void __lockfunc _write_lock_irq(rwlock_t *lock)
void __lockfunc _raw_write_lock_irq(rwlock_t *lock)
{
__write_lock_irq(lock);
__raw_write_lock_irq(lock);
}
EXPORT_SYMBOL(_write_lock_irq);
EXPORT_SYMBOL(_raw_write_lock_irq);
#endif
#ifndef CONFIG_INLINE_WRITE_LOCK_BH
void __lockfunc _write_lock_bh(rwlock_t *lock)
void __lockfunc _raw_write_lock_bh(rwlock_t *lock)
{
__write_lock_bh(lock);
__raw_write_lock_bh(lock);
}
EXPORT_SYMBOL(_write_lock_bh);
EXPORT_SYMBOL(_raw_write_lock_bh);
#endif
#ifndef CONFIG_INLINE_WRITE_UNLOCK
void __lockfunc _write_unlock(rwlock_t *lock)
void __lockfunc _raw_write_unlock(rwlock_t *lock)
{
__write_unlock(lock);
__raw_write_unlock(lock);
}
EXPORT_SYMBOL(_write_unlock);
EXPORT_SYMBOL(_raw_write_unlock);
#endif
#ifndef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE
void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
void __lockfunc _raw_write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
{
__write_unlock_irqrestore(lock, flags);
__raw_write_unlock_irqrestore(lock, flags);
}
EXPORT_SYMBOL(_write_unlock_irqrestore);
EXPORT_SYMBOL(_raw_write_unlock_irqrestore);
#endif
#ifndef CONFIG_INLINE_WRITE_UNLOCK_IRQ
void __lockfunc _write_unlock_irq(rwlock_t *lock)
void __lockfunc _raw_write_unlock_irq(rwlock_t *lock)
{
__write_unlock_irq(lock);
__raw_write_unlock_irq(lock);
}
EXPORT_SYMBOL(_write_unlock_irq);
EXPORT_SYMBOL(_raw_write_unlock_irq);
#endif
#ifndef CONFIG_INLINE_WRITE_UNLOCK_BH
void __lockfunc _write_unlock_bh(rwlock_t *lock)
void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)
{
__write_unlock_bh(lock);
__raw_write_unlock_bh(lock);
}
EXPORT_SYMBOL(_write_unlock_bh);
EXPORT_SYMBOL(_raw_write_unlock_bh);
#endif
#ifdef CONFIG_DEBUG_LOCK_ALLOC
void __lockfunc _spin_lock_nested(raw_spinlock_t *lock, int subclass)
void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
{
preempt_disable();
spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
}
EXPORT_SYMBOL(_spin_lock_nested);
EXPORT_SYMBOL(_raw_spin_lock_nested);
unsigned long __lockfunc _spin_lock_irqsave_nested(raw_spinlock_t *lock,
unsigned long __lockfunc _raw_spin_lock_irqsave_nested(raw_spinlock_t *lock,
int subclass)
{
unsigned long flags;
@ -361,16 +361,16 @@ unsigned long __lockfunc _spin_lock_irqsave_nested(raw_spinlock_t *lock,
do_raw_spin_lock_flags, &flags);
return flags;
}
EXPORT_SYMBOL(_spin_lock_irqsave_nested);
EXPORT_SYMBOL(_raw_spin_lock_irqsave_nested);
void __lockfunc _spin_lock_nest_lock(raw_spinlock_t *lock,
void __lockfunc _raw_spin_lock_nest_lock(raw_spinlock_t *lock,
struct lockdep_map *nest_lock)
{
preempt_disable();
spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_);
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
}
EXPORT_SYMBOL(_spin_lock_nest_lock);
EXPORT_SYMBOL(_raw_spin_lock_nest_lock);
#endif