1 files changed, 4 insertions, 1 deletions

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index f2e574dbc300..a7c6c5613ec9 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -176,6 +176,9 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent,
         int ret = 0;
         struct device *dev;
 
+        if (bdi->dev)   /* The driver needs to use separate queues per device */
+                goto exit;
+
         va_start(args, fmt);
         dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args);
         va_end(args);
@@ -220,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;
         }