git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
genirq: Move two IRQ functions from .init.text to .text
[safe/jmp/linux-2.6]
/
kernel
/
spinlock.c
diff --git
a/kernel/spinlock.c
b/kernel/spinlock.c
index
54eb7dd
..
be6517f
100644
(file)
--- a/
kernel/spinlock.c
+++ b/
kernel/spinlock.c
@@
-44,11
+44,11
@@
* towards that other CPU that it should break the lock ASAP.
*/
#define BUILD_LOCK_OPS(op, locktype) \
* 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(); \
{ \
for (;;) { \
preempt_disable(); \
- if (likely(
_raw_##op##_trylock(lock)))
\
+ if (likely(
do_raw_##op##_trylock(lock)))
\
break; \
preempt_enable(); \
\
break; \
preempt_enable(); \
\
@@
-60,14
+60,14
@@
void __lockfunc __##op##_lock(locktype##_t *lock) \
(lock)->break_lock = 0; \
} \
\
(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; \
\
for (;;) { \
preempt_disable(); \
local_irq_save(flags); \
{ \
unsigned long flags; \
\
for (;;) { \
preempt_disable(); \
local_irq_save(flags); \
- if (likely(
_raw_##op##_trylock(lock)))
\
+ if (likely(
do_raw_##op##_trylock(lock)))
\
break; \
local_irq_restore(flags); \
preempt_enable(); \
break; \
local_irq_restore(flags); \
preempt_enable(); \
@@
-81,12
+81,12
@@
unsigned long __lockfunc __##op##_lock_irqsave(locktype##_t *lock) \
return flags; \
} \
\
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; \
\
{ \
unsigned long flags; \
\
@@
-95,7
+95,7
@@
void __lockfunc __##op##_lock_bh(locktype##_t *lock) \
/* irq-disabling. We use the generic preemption-aware */ \
/* function: */ \
/**/ \
/* 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); \
} \
local_bh_disable(); \
local_irq_restore(flags); \
} \
@@
-116,240
+116,240
@@
BUILD_LOCK_OPS(write, rwlock);
#endif
#ifndef CONFIG_INLINE_SPIN_TRYLOCK
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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
#endif
#ifndef CONFIG_INLINE_READ_TRYLOCK
-int __lockfunc _read_trylock(rwlock_t *lock)
+int __lockfunc _r
aw_r
ead_trylock(rwlock_t *lock)
{
{
- return __read_trylock(lock);
+ return __r
aw_r
ead_trylock(lock);
}
}
-EXPORT_SYMBOL(_read_trylock);
+EXPORT_SYMBOL(_r
aw_r
ead_trylock);
#endif
#ifndef CONFIG_INLINE_READ_LOCK
#endif
#ifndef CONFIG_INLINE_READ_LOCK
-void __lockfunc _read_lock(rwlock_t *lock)
+void __lockfunc _r
aw_r
ead_lock(rwlock_t *lock)
{
{
- __read_lock(lock);
+ __r
aw_r
ead_lock(lock);
}
}
-EXPORT_SYMBOL(_read_lock);
+EXPORT_SYMBOL(_r
aw_r
ead_lock);
#endif
#ifndef CONFIG_INLINE_READ_LOCK_IRQSAVE
#endif
#ifndef CONFIG_INLINE_READ_LOCK_IRQSAVE
-unsigned long __lockfunc _read_lock_irqsave(rwlock_t *lock)
+unsigned long __lockfunc _r
aw_r
ead_lock_irqsave(rwlock_t *lock)
{
{
- return __read_lock_irqsave(lock);
+ return __r
aw_r
ead_lock_irqsave(lock);
}
}
-EXPORT_SYMBOL(_read_lock_irqsave);
+EXPORT_SYMBOL(_r
aw_r
ead_lock_irqsave);
#endif
#ifndef CONFIG_INLINE_READ_LOCK_IRQ
#endif
#ifndef CONFIG_INLINE_READ_LOCK_IRQ
-void __lockfunc _read_lock_irq(rwlock_t *lock)
+void __lockfunc _r
aw_r
ead_lock_irq(rwlock_t *lock)
{
{
- __read_lock_irq(lock);
+ __r
aw_r
ead_lock_irq(lock);
}
}
-EXPORT_SYMBOL(_read_lock_irq);
+EXPORT_SYMBOL(_r
aw_r
ead_lock_irq);
#endif
#ifndef CONFIG_INLINE_READ_LOCK_BH
#endif
#ifndef CONFIG_INLINE_READ_LOCK_BH
-void __lockfunc _read_lock_bh(rwlock_t *lock)
+void __lockfunc _r
aw_r
ead_lock_bh(rwlock_t *lock)
{
{
- __read_lock_bh(lock);
+ __r
aw_r
ead_lock_bh(lock);
}
}
-EXPORT_SYMBOL(_read_lock_bh);
+EXPORT_SYMBOL(_r
aw_r
ead_lock_bh);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK
-void __lockfunc _read_unlock(rwlock_t *lock)
+void __lockfunc _r
aw_r
ead_unlock(rwlock_t *lock)
{
{
- __read_unlock(lock);
+ __r
aw_r
ead_unlock(lock);
}
}
-EXPORT_SYMBOL(_read_unlock);
+EXPORT_SYMBOL(_r
aw_r
ead_unlock);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE
-void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
+void __lockfunc _r
aw_r
ead_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
{
{
- __read_unlock_irqrestore(lock, flags);
+ __r
aw_r
ead_unlock_irqrestore(lock, flags);
}
}
-EXPORT_SYMBOL(_read_unlock_irqrestore);
+EXPORT_SYMBOL(_r
aw_r
ead_unlock_irqrestore);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_IRQ
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_IRQ
-void __lockfunc _read_unlock_irq(rwlock_t *lock)
+void __lockfunc _r
aw_r
ead_unlock_irq(rwlock_t *lock)
{
{
- __read_unlock_irq(lock);
+ __r
aw_r
ead_unlock_irq(lock);
}
}
-EXPORT_SYMBOL(_read_unlock_irq);
+EXPORT_SYMBOL(_r
aw_r
ead_unlock_irq);
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_BH
#endif
#ifndef CONFIG_INLINE_READ_UNLOCK_BH
-void __lockfunc _read_unlock_bh(rwlock_t *lock)
+void __lockfunc _r
aw_r
ead_unlock_bh(rwlock_t *lock)
{
{
- __read_unlock_bh(lock);
+ __r
aw_r
ead_unlock_bh(lock);
}
}
-EXPORT_SYMBOL(_read_unlock_bh);
+EXPORT_SYMBOL(_r
aw_r
ead_unlock_bh);
#endif
#ifndef CONFIG_INLINE_WRITE_TRYLOCK
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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_);
{
preempt_disable();
spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
- LOCK_CONTENDED(lock,
_raw_spin_trylock,
_raw_spin_lock);
+ 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;
int subclass)
{
unsigned long flags;
@@
-357,20
+357,20
@@
unsigned long __lockfunc _spin_lock_irqsave_nested(raw_spinlock_t *lock,
local_irq_save(flags);
preempt_disable();
spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
local_irq_save(flags);
preempt_disable();
spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
- LOCK_CONTENDED_FLAGS(lock,
_raw_spin_trylock,
_raw_spin_lock,
- _raw_spin_lock_flags, &flags);
+ LOCK_CONTENDED_FLAGS(lock,
do_raw_spin_trylock, do
_raw_spin_lock,
+
do
_raw_spin_lock_flags, &flags);
return 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_);
struct lockdep_map *nest_lock)
{
preempt_disable();
spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_);
- LOCK_CONTENDED(lock,
_raw_spin_trylock,
_raw_spin_lock);
+ 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
#endif