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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / zram / zram_drv.c

diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 7f13819..685d612 100644 (file)
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -175,9 +175,9 @@ static void handle_zero_page(struct bio_vec *bvec)
        struct page *page = bvec->bv_page;
        void *user_mem;
 
-       user_mem = kmap_atomic(page, KM_USER0);
+       user_mem = kmap_atomic(page);
        memset(user_mem + bvec->bv_offset, 0, bvec->bv_len);
-       kunmap_atomic(user_mem, KM_USER0);
+       kunmap_atomic(user_mem);
 
        flush_dcache_page(page);
 }
@@ -188,12 +188,12 @@ static void handle_uncompressed_page(struct zram *zram, struct bio_vec *bvec,
        struct page *page = bvec->bv_page;
        unsigned char *user_mem, *cmem;
 
-       user_mem = kmap_atomic(page, KM_USER0);
-       cmem = kmap_atomic(zram->table[index].handle, KM_USER1);
+       user_mem = kmap_atomic(page);
+       cmem = kmap_atomic(zram->table[index].handle);
 
        memcpy(user_mem + bvec->bv_offset, cmem + offset, bvec->bv_len);
-       kunmap_atomic(cmem, KM_USER1);
-       kunmap_atomic(user_mem, KM_USER0);
+       kunmap_atomic(cmem);
+       kunmap_atomic(user_mem);
 
        flush_dcache_page(page);
 }
@@ -242,7 +242,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
                }
        }
 
-       user_mem = kmap_atomic(page, KM_USER0);
+       user_mem = kmap_atomic(page);
        if (!is_partial_io(bvec))
                uncmem = user_mem;
        clen = PAGE_SIZE;
@@ -260,7 +260,7 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
        }
 
        zs_unmap_object(zram->mem_pool, zram->table[index].handle);
-       kunmap_atomic(user_mem, KM_USER0);
+       kunmap_atomic(user_mem);
 
        /* Should NEVER happen. Return bio error if it does. */
        if (unlikely(ret != LZO_E_OK)) {
@@ -292,7 +292,7 @@ static int zram_read_before_write(struct zram *zram, char *mem, u32 index)
        /* Page is stored uncompressed since it's incompressible */
        if (unlikely(zram_test_flag(zram, index, ZRAM_UNCOMPRESSED))) {
                memcpy(mem, cmem, PAGE_SIZE);
-               kunmap_atomic(cmem, KM_USER0);
+               kunmap_atomic(cmem);
                return 0;
        }
 
@@ -351,7 +351,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
            zram_test_flag(zram, index, ZRAM_ZERO))
                zram_free_page(zram, index);
 
-       user_mem = kmap_atomic(page, KM_USER0);
+       user_mem = kmap_atomic(page);
 
        if (is_partial_io(bvec))
                memcpy(uncmem + offset, user_mem + bvec->bv_offset,
@@ -360,7 +360,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
                uncmem = user_mem;
 
        if (page_zero_filled(uncmem)) {
-               kunmap_atomic(user_mem, KM_USER0);
+               kunmap_atomic(user_mem);
                if (is_partial_io(bvec))
                        kfree(uncmem);
                zram_stat_inc(&zram->stats.pages_zero);
@@ -372,7 +372,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
        ret = lzo1x_1_compress(uncmem, PAGE_SIZE, src, &clen,
                               zram->compress_workmem);
 
-       kunmap_atomic(user_mem, KM_USER0);
+       kunmap_atomic(user_mem);
        if (is_partial_io(bvec))
                        kfree(uncmem);
 
@@ -400,8 +400,8 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
                zram_set_flag(zram, index, ZRAM_UNCOMPRESSED);
                zram_stat_inc(&zram->stats.pages_expand);
                handle = page_store;
-               src = kmap_atomic(page, KM_USER0);
-               cmem = kmap_atomic(page_store, KM_USER1);
+               src = kmap_atomic(page);
+               cmem = kmap_atomic(page_store);
                goto memstore;
        }
 
@@ -427,8 +427,8 @@ memstore:
        memcpy(cmem, src, clen);
 
        if (unlikely(zram_test_flag(zram, index, ZRAM_UNCOMPRESSED))) {
-               kunmap_atomic(cmem, KM_USER1);
-               kunmap_atomic(src, KM_USER0);
+               kunmap_atomic(cmem);
+               kunmap_atomic(src);
        } else {
                zs_unmap_object(zram->mem_pool, handle);
        }