summaryrefslogtreecommitdiff
path: root/include/linux/rcupdate.h
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-06-30 03:26:38 -0700
committerLinux Build Service Account <lnxbuild@localhost>2019-06-30 03:26:38 -0700
commitf6f18bf58a688e45e149708a00659bd1010ef94c (patch)
treeaea1549c4c8f28ad359a92b7702481b2cb369d20 /include/linux/rcupdate.h
parentc9d92a953ba0dffba643376ec463754a88db107a (diff)
parent17c66e9e49a181498ae3c75809c98fdbe630de28 (diff)
Merge 17c66e9e49a181498ae3c75809c98fdbe630de28 on remote branch
Change-Id: I49238aefe09bba152a8000c046959157c328f183
Diffstat (limited to 'include/linux/rcupdate.h')
-rw-r--r--include/linux/rcupdate.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index a0189ba67fde..addd03641e1a 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -297,14 +297,12 @@ void synchronize_rcu(void);
static inline void __rcu_read_lock(void)
{
- if (IS_ENABLED(CONFIG_PREEMPT_COUNT))
- preempt_disable();
+ preempt_disable();
}
static inline void __rcu_read_unlock(void)
{
- if (IS_ENABLED(CONFIG_PREEMPT_COUNT))
- preempt_enable();
+ preempt_enable();
}
static inline void synchronize_rcu(void)