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/rcuclassic.c | |
| parent | f17c75453b2d195eba0a90d9f16a3ba88c85b3b4 (diff) | |
| parent | 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff) | |
Merge branch 'linus' into irq/genirq
Diffstat (limited to 'kernel/rcuclassic.c')
| -rw-r--r-- | kernel/rcuclassic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c index 490934fc7ac3..bd5a9003497c 100644 --- a/kernel/rcuclassic.c +++ b/kernel/rcuclassic.c | |||
| @@ -716,7 +716,7 @@ void rcu_check_callbacks(int cpu, int user) | |||
| 716 | raise_rcu_softirq(); | 716 | raise_rcu_softirq(); |
| 717 | } | 717 | } |
| 718 | 718 | ||
| 719 | static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp, | 719 | static void __cpuinit rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp, |
| 720 | struct rcu_data *rdp) | 720 | struct rcu_data *rdp) |
| 721 | { | 721 | { |
| 722 | unsigned long flags; | 722 | unsigned long flags; |