summaryrefslogtreecommitdiff
path: root/include/linux/rcutree.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-01-06 11:41:48 +0100
committerIngo Molnar <mingo@kernel.org>2016-01-06 11:41:48 +0100
commit3104fb3dd45bb47ff1382d1c079c251710ddcae3 (patch)
tree0c562ad5b3a960b3299edd5abdbe12b9f0a50a6b /include/linux/rcutree.h
parentee9a7d2cb0cf1a1498478bc923d911f3d9c910ac (diff)
parent984cf355aeaa8f2eda3861b50d0e8d3e3f77e83b (diff)
downloadlinux-next-3104fb3dd45bb47ff1382d1c079c251710ddcae3.tar.gz
linux-next-3104fb3dd45bb47ff1382d1c079c251710ddcae3.zip
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU changes from Paul E. McKenney: - Adding transitivity uniformly to rcu_node structure ->lock acquisitions. (This is implemented by the first two commits on top of v4.4-rc2 due to the pervasive nature of this change.) - Documentation updates, including RCU requirements. - Expedited grace-period changes. - Miscellaneous fixes. - Linked-list fixes, courtesy of KTSAN. - Torture-test updates. - Late-breaking fix to sysrq-generated crash. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/rcutree.h')
-rw-r--r--include/linux/rcutree.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
index 60d15a080d7c..ad1eda9fa4da 100644
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
@@ -37,7 +37,7 @@ void rcu_cpu_stall_reset(void);
/*
* Note a virtualization-based context switch. This is simply a
* wrapper around rcu_note_context_switch(), which allows TINY_RCU
- * to save a few bytes.
+ * to save a few bytes. The caller must have disabled interrupts.
*/
static inline void rcu_virt_note_context_switch(int cpu)
{
@@ -97,6 +97,8 @@ void rcu_idle_enter(void);
void rcu_idle_exit(void);
void rcu_irq_enter(void);
void rcu_irq_exit(void);
+void rcu_irq_enter_irqson(void);
+void rcu_irq_exit_irqson(void);
void exit_rcu(void);