]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
target: remove the second argument of k[un]map_atomic()
authorCong Wang <amwang@redhat.com>
Fri, 25 Nov 2011 15:14:25 +0000 (23:14 +0800)
committerCong Wang <xiyou.wangcong@gmail.com>
Tue, 20 Mar 2012 13:48:20 +0000 (21:48 +0800)
Signed-off-by: Cong Wang <amwang@redhat.com>
drivers/target/target_core_transport.c
drivers/target/tcm_fc/tfc_io.c

index cd5cd95812bbfdd0b5d57428224e596d3e129c86..929cc9364c8a31bac220a490eb76ef7e11ca2e0e 100644 (file)
@@ -2344,7 +2344,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
 
        offset = 0;
        for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) {
-               addr = kmap_atomic(sg_page(sg), KM_USER0);
+               addr = kmap_atomic(sg_page(sg));
                if (!addr)
                        goto out;
 
@@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
                        *(addr + sg->offset + i) ^= *(buf + offset + i);
 
                offset += sg->length;
-               kunmap_atomic(addr, KM_USER0);
+               kunmap_atomic(addr);
        }
 
 out:
index d8cabc21036d3ec1040168b9940ab013c55b4a0b..2b693eefac556064c6dd54747fa7516cdb008469 100644 (file)
@@ -146,14 +146,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
                                        PAGE_SIZE << compound_order(page);
                } else {
                        BUG_ON(!page);
-                       from = kmap_atomic(page + (mem_off >> PAGE_SHIFT),
-                                          KM_SOFTIRQ0);
+                       from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
                        page_addr = from;
                        from += mem_off & ~PAGE_MASK;
                        tlen = min(tlen, (size_t)(PAGE_SIZE -
                                                (mem_off & ~PAGE_MASK)));
                        memcpy(to, from, tlen);
-                       kunmap_atomic(page_addr, KM_SOFTIRQ0);
+                       kunmap_atomic(page_addr);
                        to += tlen;
                }
 
@@ -291,14 +290,13 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
 
                tlen = min(mem_len, frame_len);
 
-               to = kmap_atomic(page + (mem_off >> PAGE_SHIFT),
-                                KM_SOFTIRQ0);
+               to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
                page_addr = to;
                to += mem_off & ~PAGE_MASK;
                tlen = min(tlen, (size_t)(PAGE_SIZE -
                                          (mem_off & ~PAGE_MASK)));
                memcpy(to, from, tlen);
-               kunmap_atomic(page_addr, KM_SOFTIRQ0);
+               kunmap_atomic(page_addr);
 
                from += tlen;
                frame_len -= tlen;