net-memcg: pass in gfp_t mask to mem_cgroup_charge_skmem()

[linux-2.6-microblaze.git] / net / ipv4 / inet_connection_sock.c

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 754013f..f25d02a 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -534,7 +534,8 @@ out:
                                   atomic_read(&newsk->sk_rmem_alloc));
                mem_cgroup_sk_alloc(newsk);
                if (newsk->sk_memcg && amt)
-                       mem_cgroup_charge_skmem(newsk->sk_memcg, amt);
+                       mem_cgroup_charge_skmem(newsk->sk_memcg, amt,
+                                               GFP_KERNEL | __GFP_NOFAIL);
 
                release_sock(newsk);
        }