diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-09 13:44:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-09 13:44:23 -0800 |
| commit | 3969eb3859e4fad4b32ca8f96d4ec8551c20704a (patch) | |
| tree | 06620d8c94d92ab187f6ce8e72f2d0453d734314 | |
| parent | 2429f7ac2ef429378536d87fcbbf6f424aa5b47f (diff) | |
net: Fix build with INET disabled.
> net/core/sock.c: In function 'sk_update_clone':
> net/core/sock.c:1278:3: error: implicit declaration of function 'sock_update_memcg'
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/memcontrol.h | 2 | ||||
| -rw-r--r-- | net/core/sock.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9b296ea41bb..f944591765e 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -390,7 +390,6 @@ enum { OVER_LIMIT, }; -#ifdef CONFIG_INET struct sock; #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM void sock_update_memcg(struct sock *sk); @@ -403,6 +402,5 @@ static inline void sock_release_memcg(struct sock *sk) { } #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ -#endif /* CONFIG_INET */ #endif /* _LINUX_MEMCONTROL_H */ diff --git a/net/core/sock.c b/net/core/sock.c index c3ae73de023..5c5af9988f9 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -112,6 +112,7 @@ #include <linux/highmem.h> #include <linux/user_namespace.h> #include <linux/jump_label.h> +#include <linux/memcontrol.h> #include <asm/uaccess.h> #include <asm/system.h> |