diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-02 16:08:56 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-02 16:08:56 -0500 |
| commit | c02368a9d059322f913a58111eade87a656fefd5 (patch) | |
| tree | 2f02dbbe69b86535f58d2010d9adfb20a9c16fb9 /kernel/rcutree.c | |
| parent | f17c75453b2d195eba0a90d9f16a3ba88c85b3b4 (diff) | |
| parent | 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff) | |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'kernel/rcutree.c')
| -rw-r--r-- | kernel/rcutree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcutree.c b/kernel/rcutree.c index f2d8638e6c60..b2fd602a6f6f 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c | |||
| @@ -1314,7 +1314,7 @@ int rcu_needs_cpu(int cpu) | |||
| 1314 | * access due to the fact that this CPU cannot possibly have any RCU | 1314 | * access due to the fact that this CPU cannot possibly have any RCU |
| 1315 | * callbacks in flight yet. | 1315 | * callbacks in flight yet. |
| 1316 | */ | 1316 | */ |
| 1317 | static void | 1317 | static void __cpuinit |
| 1318 | rcu_init_percpu_data(int cpu, struct rcu_state *rsp) | 1318 | rcu_init_percpu_data(int cpu, struct rcu_state *rsp) |
| 1319 | { | 1319 | { |
| 1320 | unsigned long flags; | 1320 | unsigned long flags; |