net: move sock_update_memcg outside of CONFIG_INET
authorGlauber Costa <glommer@parallels.com>
Sun, 15 Jan 2012 22:04:39 +0000 (22:04 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Jan 2012 15:15:45 +0000 (10:15 -0500)
commit319d3b9c97b5e3191e419bb95496bf08ec50f096
tree6e57f4183060aab780d17fe8f6ac11272cc679fc
parent8d9d399f14ea65aeb50c7404e986bceede93bb99
net: move sock_update_memcg outside of CONFIG_INET

Although only used currently for tcp sockets, this function
is now used in common sock code (for sock_clone())

Commit 475f1b52645a29936b9df1d8fcd45f7e56bd4a9f moved the
declaration of sock_update_clone() to inside sock.c, but
this only fixes the problem when CONFIG_CGROUP_MEM_RES_CTLR_KMEM
is also not defined.

This patch here is verified to fix both problems, although
reverting the previous one is not necessary.

Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: David S. Miller <davem@davemloft.net>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
mm/memcontrol.c