Merge branches 'core/futexes', 'core/locking', 'core/rcu' and 'linus' into core/urgent

This commit is contained in:
Ingo Molnar
2009-01-06 09:32:11 +01:00
453 changed files with 32825 additions and 12272 deletions

View File

@@ -223,7 +223,7 @@ int bdi_init(struct backing_dev_info *bdi)
bdi->max_prop_frac = PROP_FRAC_BASE;
for (i = 0; i < NR_BDI_STAT_ITEMS; i++) {
err = percpu_counter_init_irq(&bdi->bdi_stat[i], 0);
err = percpu_counter_init(&bdi->bdi_stat[i], 0);
if (err)
goto err;
}