diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-06-14 07:31:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-14 07:31:46 +0200 |
| commit | 10b90ee2eccca042e2d762881dd7119d201f0898 (patch) | |
| tree | 1ebc06bf55a3e33244228d008a2db0197ae2281e /include/linux/srcu.h | |
| parent | x86/mce/AMD: Carve out SMCA bank configuration (diff) | |
| parent | Linux 4.12-rc5 (diff) | |
Merge tag 'v4.12-rc5' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/srcu.h')
| -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; } |