diff options
Diffstat (limited to 'kernel/spinlock.c')
| -rw-r--r-- | kernel/spinlock.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/spinlock.c b/kernel/spinlock.c index a1fb54c93cdd..29ab20749dd3 100644 --- a/kernel/spinlock.c +++ b/kernel/spinlock.c | |||
| @@ -290,8 +290,8 @@ void __lockfunc _spin_lock_nested(spinlock_t *lock, int subclass) | |||
| 290 | spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_); | 290 | spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_); |
| 291 | LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock); | 291 | LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock); |
| 292 | } | 292 | } |
| 293 | |||
| 294 | EXPORT_SYMBOL(_spin_lock_nested); | 293 | EXPORT_SYMBOL(_spin_lock_nested); |
| 294 | |||
| 295 | unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass) | 295 | unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclass) |
| 296 | { | 296 | { |
| 297 | unsigned long flags; | 297 | unsigned long flags; |
| @@ -311,9 +311,17 @@ unsigned long __lockfunc _spin_lock_irqsave_nested(spinlock_t *lock, int subclas | |||
| 311 | #endif | 311 | #endif |
| 312 | return flags; | 312 | return flags; |
| 313 | } | 313 | } |
| 314 | |||
| 315 | EXPORT_SYMBOL(_spin_lock_irqsave_nested); | 314 | EXPORT_SYMBOL(_spin_lock_irqsave_nested); |
| 316 | 315 | ||
| 316 | void __lockfunc _spin_lock_nest_lock(spinlock_t *lock, | ||
| 317 | struct lockdep_map *nest_lock) | ||
| 318 | { | ||
| 319 | preempt_disable(); | ||
| 320 | spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_); | ||
| 321 | LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock); | ||
| 322 | } | ||
| 323 | EXPORT_SYMBOL(_spin_lock_nest_lock); | ||
| 324 | |||
| 317 | #endif | 325 | #endif |
| 318 | 326 | ||
| 319 | void __lockfunc _spin_unlock(spinlock_t *lock) | 327 | void __lockfunc _spin_unlock(spinlock_t *lock) |
