diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-28 20:42:26 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-28 20:42:26 -0400 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /kernel/rcupdate.c | |
| parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/rcupdate.c')
| -rw-r--r-- | kernel/rcupdate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 13458bbaa1b..6d32ff26f94 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
| @@ -520,7 +520,7 @@ static void __devinit rcu_online_cpu(int cpu) | |||
| 520 | tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL); | 520 | tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL); |
| 521 | } | 521 | } |
| 522 | 522 | ||
| 523 | static int __devinit rcu_cpu_notify(struct notifier_block *self, | 523 | static int rcu_cpu_notify(struct notifier_block *self, |
| 524 | unsigned long action, void *hcpu) | 524 | unsigned long action, void *hcpu) |
| 525 | { | 525 | { |
| 526 | long cpu = (long)hcpu; | 526 | long cpu = (long)hcpu; |
| @@ -537,7 +537,7 @@ static int __devinit rcu_cpu_notify(struct notifier_block *self, | |||
| 537 | return NOTIFY_OK; | 537 | return NOTIFY_OK; |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | static struct notifier_block __devinitdata rcu_nb = { | 540 | static struct notifier_block rcu_nb = { |
| 541 | .notifier_call = rcu_cpu_notify, | 541 | .notifier_call = rcu_cpu_notify, |
| 542 | }; | 542 | }; |
| 543 | 543 | ||