Merge branch 'kmap_atomic' of git://github.com/congwang/linux

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / zcache / zcache-main.c

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 7073465..ed2c800 100644 (file)
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -455,14 +455,14 @@ static int zbud_decompress(struct page *page, struct zbud_hdr *zh)
        }
        ASSERT_SENTINEL(zh, ZBH);
        BUG_ON(zh->size == 0 || zh->size > zbud_max_buddy_size());
-       to_va = kmap_atomic(page, KM_USER0);
+       to_va = kmap_atomic(page);
        size = zh->size;
        from_va = zbud_data(zh, size);
        ret = zcache_comp_op(ZCACHE_COMPOP_DECOMPRESS, from_va, size,
                                to_va, &out_len);
        BUG_ON(ret);
        BUG_ON(out_len != PAGE_SIZE);
-       kunmap_atomic(to_va, KM_USER0);
+       kunmap_atomic(to_va);
 out:
        spin_unlock(&zbpg->lock);
        return ret;
@@ -753,10 +753,10 @@ static void zv_decompress(struct page *page, void *handle)
        zv = zs_map_object(zcache_host.zspool, handle);
        BUG_ON(zv->size == 0);
        ASSERT_SENTINEL(zv, ZVH);
-       to_va = kmap_atomic(page, KM_USER0);
+       to_va = kmap_atomic(page);
        ret = zcache_comp_op(ZCACHE_COMPOP_DECOMPRESS, (char *)zv + sizeof(*zv),
                                zv->size, to_va, &clen);
-       kunmap_atomic(to_va, KM_USER0);
+       kunmap_atomic(to_va);
        zs_unmap_object(zcache_host.zspool, handle);
        BUG_ON(ret);
        BUG_ON(clen != PAGE_SIZE);
@@ -1334,13 +1334,13 @@ static int zcache_compress(struct page *from, void **out_va, unsigned *out_len)
        if (unlikely(dmem == NULL))
                goto out;  /* no buffer or no compressor so can't compress */
        *out_len = PAGE_SIZE << ZCACHE_DSTMEM_ORDER;
-       from_va = kmap_atomic(from, KM_USER0);
+       from_va = kmap_atomic(from);
        mb();
        ret = zcache_comp_op(ZCACHE_COMPOP_COMPRESS, from_va, PAGE_SIZE, dmem,
                                out_len);
        BUG_ON(ret);
        *out_va = dmem;
-       kunmap_atomic(from_va, KM_USER0);
+       kunmap_atomic(from_va);
        ret = 1;
 out:
        return ret;