diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-09 16:44:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-09 16:44:23 -0500 |
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 9b296ea41bb8..f944591765eb 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -390,7 +390,6 @@ enum { | |||
390 | OVER_LIMIT, | 390 | OVER_LIMIT, |
391 | }; | 391 | }; |
392 | 392 | ||
393 | #ifdef CONFIG_INET | ||
394 | struct sock; | 393 | struct sock; |
395 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM | 394 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM |
396 | void sock_update_memcg(struct sock *sk); | 395 | void sock_update_memcg(struct sock *sk); |
@@ -403,6 +402,5 @@ static inline void sock_release_memcg(struct sock *sk) | |||
403 | { | 402 | { |
404 | } | 403 | } |
405 | #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ | 404 | #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ |
406 | #endif /* CONFIG_INET */ | ||
407 | #endif /* _LINUX_MEMCONTROL_H */ | 405 | #endif /* _LINUX_MEMCONTROL_H */ |
408 | 406 | ||
diff --git a/net/core/sock.c b/net/core/sock.c index c3ae73de0239..5c5af9988f94 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -112,6 +112,7 @@ | |||
112 | #include <linux/highmem.h> | 112 | #include <linux/highmem.h> |
113 | #include <linux/user_namespace.h> | 113 | #include <linux/user_namespace.h> |
114 | #include <linux/jump_label.h> | 114 | #include <linux/jump_label.h> |
115 | #include <linux/memcontrol.h> | ||
115 | 116 | ||
116 | #include <asm/uaccess.h> | 117 | #include <asm/uaccess.h> |
117 | #include <asm/system.h> | 118 | #include <asm/system.h> |