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

[firefly-linux-kernel-4.4.55.git] / net / rds / ib_recv.c

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 8d6d9702d1ec9092b6e9fbde2599c5f6663a2472..8d194912c695ba86afc235c5792556c912da71f3 100644 (file)
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -763,7 +763,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn,
                to_copy = min(RDS_FRAG_SIZE - frag_off, PAGE_SIZE - map_off);
                BUG_ON(to_copy & 7); /* Must be 64bit aligned. */
 
-               addr = kmap_atomic(sg_page(&frag->f_sg), KM_SOFTIRQ0);
+               addr = kmap_atomic(sg_page(&frag->f_sg));
 
                src = addr + frag_off;
                dst = (void *)map->m_page_addrs[map_page] + map_off;
@@ -773,7 +773,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn,
                        uncongested |= ~(*src) & *dst;
                        *dst++ = *src++;
                }
-               kunmap_atomic(addr, KM_SOFTIRQ0);
+               kunmap_atomic(addr);
 
                copied += to_copy;
 
@@ -919,8 +919,7 @@ static void rds_ib_process_recv(struct rds_connection *conn,
                        rds_ib_cong_recv(conn, ibinc);
                else {
                        rds_recv_incoming(conn, conn->c_faddr, conn->c_laddr,
-                                         &ibinc->ii_inc, GFP_ATOMIC,
-                                         KM_SOFTIRQ0);
+                                         &ibinc->ii_inc, GFP_ATOMIC);
                        state->ack_next = be64_to_cpu(hdr->h_sequence);
                        state->ack_next_valid = 1;
                }