diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-09 09:17:10 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-09 09:17:10 +0300 |
| commit | 8affb06737ae565722764c2b309eb0e892538344 (patch) | |
| tree | 80ee0ce911755a2d30a18c7698ea1424764e8de6 /include/linux | |
| parent | b29794ec95c6856b316c2295904208bf11ffddd9 (diff) | |
| parent | 1123a6041654e8f889014659593bad4168e542c2 (diff) | |
| download | linux-8affb06737ae565722764c2b309eb0e892538344.tar.xz | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into rcu/urgent
Pull RCU fix from Paul E. McKenney:
" This series enables srcu_read_lock() and srcu_read_unlock() to be used from
interrupt handlers, which fixes a bug in KVM's use of SRCU in delivery
of interrupts to guest OSes. "
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/srcu.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/srcu.h b/include/linux/srcu.h index 167ad8831aaf..4c1d5f7e62c4 100644 --- a/include/linux/srcu.h +++ b/include/linux/srcu.h @@ -172,9 +172,7 @@ static inline int srcu_read_lock(struct srcu_struct *sp) __acquires(sp) { int retval; - preempt_disable(); retval = __srcu_read_lock(sp); - preempt_enable(); rcu_lock_acquire(&(sp)->dep_map); return retval; } |