Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / mtd / ubi / wl.c

diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index d5076d2..42c684c 100644 (file)
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -616,7 +616,7 @@ static void schedule_ubi_work(struct ubi_device *ubi, struct ubi_work *wrk)
        list_add_tail(&wrk->list, &ubi->works);
        ubi_assert(ubi->works_count >= 0);
        ubi->works_count += 1;
-       if (ubi->thread_enabled && !ubi_dbg_is_bgt_disabled())
+       if (ubi->thread_enabled && !ubi_dbg_is_bgt_disabled(ubi))
                wake_up_process(ubi->bgt_thread);
        spin_unlock(&ubi->wl_lock);
 }
@@ -1367,7 +1367,7 @@ int ubi_thread(void *u)
 
                spin_lock(&ubi->wl_lock);
                if (list_empty(&ubi->works) || ubi->ro_mode ||
-                   !ubi->thread_enabled || ubi_dbg_is_bgt_disabled()) {
+                   !ubi->thread_enabled || ubi_dbg_is_bgt_disabled(ubi)) {
                        set_current_state(TASK_INTERRUPTIBLE);
                        spin_unlock(&ubi->wl_lock);
                        schedule();
@@ -1582,7 +1582,7 @@ static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec)
        long long read_ec;
        struct ubi_ec_hdr *ec_hdr;
 
-       if (!(ubi_chk_flags & UBI_CHK_GEN))
+       if (!ubi->dbg->chk_gen)
                return 0;
 
        ec_hdr = kzalloc(ubi->ec_hdr_alsize, GFP_NOFS);
@@ -1623,7 +1623,7 @@ static int paranoid_check_in_wl_tree(const struct ubi_device *ubi,
                                     struct ubi_wl_entry *e,
                                     struct rb_root *root)
 {
-       if (!(ubi_chk_flags & UBI_CHK_GEN))
+       if (!ubi->dbg->chk_gen)
                return 0;
 
        if (in_wl_tree(e, root))
@@ -1649,7 +1649,7 @@ static int paranoid_check_in_pq(const struct ubi_device *ubi,
        struct ubi_wl_entry *p;
        int i;
 
-       if (!(ubi_chk_flags & UBI_CHK_GEN))
+       if (!ubi->dbg->chk_gen)
                return 0;
 
        for (i = 0; i < UBI_PROT_QUEUE_LEN; ++i)