]> git.baikalelectronics.ru Git - kernel.git/commit
memcg, kmem: fix build error when CONFIG_INET is disabled
authorDavid Rientjes <rientjes@google.com>
Wed, 10 Oct 2012 22:54:08 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Oct 2012 23:50:16 +0000 (08:50 +0900)
commit2857d30a50e8aad8c11ead70062c2cac0da713e0
treebc3c7f4b4343d1e74a1f54b17d25069bf62ca3e9
parentb8650da4f4360b28e078cd9fec16ad1c71668ac9
memcg, kmem: fix build error when CONFIG_INET is disabled

Commit 5b2db67c3ac2 ("socket: initial cgroup code.") causes a build
error when CONFIG_INET is disabled in Linus' tree:

  net/built-in.o: In function `sk_update_clone':
  net/core/sock.c:1336: undefined reference to `sock_update_memcg'

sock_update_memcg() is only defined when CONFIG_INET is enabled, so fix
it by defining the dummy function without this option.

Signed-off-by: David Rientjes <rientjes@google.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Glauber Costa <glommer@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/memcontrol.h