diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-10 10:22:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-10 10:22:35 -0700 |
| commit | 6b7ed4588ce681222534f901ce825d1ead31882a (patch) | |
| tree | e6b6d004d6f7cfbc8ab4c1f993a2c61ec6fc2702 /include | |
| parent | f701d860af381265639244fb84b07797fbb5efca (diff) | |
| parent | 8affb06737ae565722764c2b309eb0e892538344 (diff) | |
| download | linux-6b7ed4588ce681222534f901ce825d1ead31882a.tar.gz linux-6b7ed4588ce681222534f901ce825d1ead31882a.tar.bz2 linux-6b7ed4588ce681222534f901ce825d1ead31882a.zip | |
Merge branch 'rcu-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU fixes from Ingo Molnar:
"Fix an SRCU bug affecting KVM IRQ injection"
* 'rcu-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
srcu: Allow use of Classic SRCU from both process and interrupt context
srcu: Allow use of Tiny/Tree SRCU from both process and interrupt context
Diffstat (limited to 'include')
| -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; } |