diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/rcutree.c | 6 | ||||
-rw-r--r-- | kernel/rcutree.h | 6 | ||||
-rw-r--r-- | kernel/srcu.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 3b13d64b010b..099a255ede4c 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
@@ -1888,7 +1888,7 @@ do { \ | |||
1888 | 1888 | ||
1889 | void __init rcu_init(void) | 1889 | void __init rcu_init(void) |
1890 | { | 1890 | { |
1891 | int i; | 1891 | int cpu; |
1892 | 1892 | ||
1893 | rcu_bootup_announce(); | 1893 | rcu_bootup_announce(); |
1894 | #ifdef CONFIG_RCU_CPU_STALL_DETECTOR | 1894 | #ifdef CONFIG_RCU_CPU_STALL_DETECTOR |
@@ -1908,8 +1908,8 @@ void __init rcu_init(void) | |||
1908 | * or the scheduler are operational. | 1908 | * or the scheduler are operational. |
1909 | */ | 1909 | */ |
1910 | cpu_notifier(rcu_cpu_notify, 0); | 1910 | cpu_notifier(rcu_cpu_notify, 0); |
1911 | for_each_online_cpu(i) | 1911 | for_each_online_cpu(cpu) |
1912 | rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)i); | 1912 | rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)cpu); |
1913 | } | 1913 | } |
1914 | 1914 | ||
1915 | #include "rcutree_plugin.h" | 1915 | #include "rcutree_plugin.h" |
diff --git a/kernel/rcutree.h b/kernel/rcutree.h index bd5d78ad1c48..d9d032abd665 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h | |||
@@ -323,8 +323,6 @@ struct rcu_state { | |||
323 | #define RCU_OFL_TASKS_EXP_GP 0x2 /* Tasks blocking expedited */ | 323 | #define RCU_OFL_TASKS_EXP_GP 0x2 /* Tasks blocking expedited */ |
324 | /* GP were moved to root. */ | 324 | /* GP were moved to root. */ |
325 | 325 | ||
326 | #ifdef RCU_TREE_NONCORE | ||
327 | |||
328 | /* | 326 | /* |
329 | * RCU implementation internal declarations: | 327 | * RCU implementation internal declarations: |
330 | */ | 328 | */ |
@@ -339,7 +337,7 @@ extern struct rcu_state rcu_preempt_state; | |||
339 | DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data); | 337 | DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data); |
340 | #endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */ | 338 | #endif /* #ifdef CONFIG_TREE_PREEMPT_RCU */ |
341 | 339 | ||
342 | #else /* #ifdef RCU_TREE_NONCORE */ | 340 | #ifndef RCU_TREE_NONCORE |
343 | 341 | ||
344 | /* Forward declarations for rcutree_plugin.h */ | 342 | /* Forward declarations for rcutree_plugin.h */ |
345 | static void rcu_bootup_announce(void); | 343 | static void rcu_bootup_announce(void); |
@@ -372,4 +370,4 @@ static void __cpuinit rcu_preempt_init_percpu_data(int cpu); | |||
372 | static void rcu_preempt_send_cbs_to_orphanage(void); | 370 | static void rcu_preempt_send_cbs_to_orphanage(void); |
373 | static void __init __rcu_init_preempt(void); | 371 | static void __init __rcu_init_preempt(void); |
374 | 372 | ||
375 | #endif /* #else #ifdef RCU_TREE_NONCORE */ | 373 | #endif /* #ifndef RCU_TREE_NONCORE */ |
diff --git a/kernel/srcu.c b/kernel/srcu.c index 818d7d9aa03c..31b275b9c112 100644 --- a/kernel/srcu.c +++ b/kernel/srcu.c | |||
@@ -144,7 +144,7 @@ EXPORT_SYMBOL_GPL(srcu_read_unlock); | |||
144 | /* | 144 | /* |
145 | * Helper function for synchronize_srcu() and synchronize_srcu_expedited(). | 145 | * Helper function for synchronize_srcu() and synchronize_srcu_expedited(). |
146 | */ | 146 | */ |
147 | void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void)) | 147 | static void __synchronize_srcu(struct srcu_struct *sp, void (*sync_func)(void)) |
148 | { | 148 | { |
149 | int idx; | 149 | int idx; |
150 | 150 | ||