diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 03:52:45 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-26 03:52:45 -0500 |
| commit | 05ecd91f9d066018984ba91b5fde52d74ffef0ac (patch) | |
| tree | ccf39a8aa331a0ade6819ccb892efba5c4adf8e6 | |
| parent | adf1795caca2dab919e4a80062825433f2874ae5 (diff) | |
| download | 4.9-rt-patches-05ecd91f9d066018984ba91b5fde52d74ffef0ac.tar.gz | |
rcu: import refresh for __latent_entropy annotations
| -rw-r--r-- | patches/rcu-Eliminate-softirq-processing-from-rcutree.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch b/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch index 6b3df0d9c1bffb..b50477d3bf8484 100644 --- a/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch +++ b/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch @@ -23,7 +23,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c -@@ -56,6 +56,11 @@ +@@ -55,6 +55,11 @@ #include <linux/random.h> #include <linux/trace_events.h> #include <linux/suspend.h> @@ -39,8 +39,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * Do RCU core processing for the current CPU. */ --static void rcu_process_callbacks(struct softirq_action *unused) -+static void rcu_process_callbacks(void) +-static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused) ++static __latent_entropy void rcu_process_callbacks(void) { struct rcu_state *rsp; @@ -168,7 +168,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> /* * Handle any core-RCU processing required by a call_rcu() invocation. -@@ -4237,7 +4328,6 @@ void __init rcu_init(void) +@@ -4261,7 +4352,6 @@ void __init rcu_init(void) if (dump_tree) rcu_dump_rcu_node_tree(&rcu_sched_state); __rcu_init_preempt(); @@ -178,7 +178,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> * We don't need protection against CPU-hotplug here because --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h -@@ -595,12 +595,10 @@ extern struct rcu_state rcu_bh_state; +@@ -596,12 +596,10 @@ extern struct rcu_state rcu_bh_state; extern struct rcu_state rcu_preempt_state; #endif /* #ifdef CONFIG_PREEMPT_RCU */ @@ -191,7 +191,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> #ifndef RCU_TREE_NONCORE -@@ -620,10 +618,9 @@ void call_rcu(struct rcu_head *head, rcu +@@ -621,10 +619,9 @@ void call_rcu(struct rcu_head *head, rcu static void __init __rcu_init_preempt(void); static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags); static void rcu_preempt_boost_start_gp(struct rcu_node *rnp); |