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

[linux-2.6-omap-h63xx.git] / mm / backing-dev.c

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 801c08b046e6cc0f1a12740dc74fed16ff018fe6..a7c6c5613ec9fed872bc9a22ca819321f7353889 100644 (file)
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -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;
        }