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

[~andy/linux] / net / rds / info.c

diff --git a/net/rds/info.c b/net/rds/info.c
index f1c016c4146ec4092202f18db1abd0c0ce104017..9a6b4f66187cf3e5ab533cd01344c9856834ebb7 100644 (file)
--- a/net/rds/info.c
+++ b/net/rds/info.c
@@ -104,7 +104,7 @@ EXPORT_SYMBOL_GPL(rds_info_deregister_func);
 void rds_info_iter_unmap(struct rds_info_iterator *iter)
 {
        if (iter->addr) {
-               kunmap_atomic(iter->addr, KM_USER0);
+               kunmap_atomic(iter->addr);
                iter->addr = NULL;
        }
 }
@@ -119,7 +119,7 @@ void rds_info_copy(struct rds_info_iterator *iter, void *data,
 
        while (bytes) {
                if (!iter->addr)
-                       iter->addr = kmap_atomic(*iter->pages, KM_USER0);
+                       iter->addr = kmap_atomic(*iter->pages);
 
                this = min(bytes, PAGE_SIZE - iter->offset);
 
@@ -134,7 +134,7 @@ void rds_info_copy(struct rds_info_iterator *iter, void *data,
                iter->offset += this;
 
                if (iter->offset == PAGE_SIZE) {
-                       kunmap_atomic(iter->addr, KM_USER0);
+                       kunmap_atomic(iter->addr);
                        iter->addr = NULL;
                        iter->offset = 0;
                        iter->pages++;