diff options
author | Thomas Graf <tgraf@suug.ch> | 2015-01-02 23:00:19 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-03 20:32:57 +0100 |
commit | 113948d841e8d78039e5dbbb5248f5b73e99eafa (patch) | |
tree | dd83aa9e9cc3d6cae386afa57dad4046df7e33bd /kernel | |
parent | nft_hash: Remove rhashtable_remove_pprev() (diff) | |
download | linux-113948d841e8d78039e5dbbb5248f5b73e99eafa.tar.xz linux-113948d841e8d78039e5dbbb5248f5b73e99eafa.zip |
spinlock: Add spin_lock_bh_nested()
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/locking/spinlock.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c index 4b082b5cac9e..db3ccb1dd614 100644 --- a/kernel/locking/spinlock.c +++ b/kernel/locking/spinlock.c @@ -363,6 +363,14 @@ void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) } EXPORT_SYMBOL(_raw_spin_lock_nested); +void __lockfunc _raw_spin_lock_bh_nested(raw_spinlock_t *lock, int subclass) +{ + __local_bh_disable_ip(_RET_IP_, SOFTIRQ_LOCK_OFFSET); + spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_); + LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock); +} +EXPORT_SYMBOL(_raw_spin_lock_bh_nested); + unsigned long __lockfunc _raw_spin_lock_irqsave_nested(raw_spinlock_t *lock, int subclass) { |