From: Glauber Costa <redacted>
Date: Mon, 16 Jan 2012 12:04:39 +0400

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 <redacted>

Applied, but with a fixed subject line, you must always prefix your
subject line with the subsystem your change is being made to.  In
this case simply "net: " would have been sufficient, so that's what
I added.