Commit 3969eb38 authored by David S. Miller's avatar David S. Miller

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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2429f7ac
...@@ -390,7 +390,6 @@ enum { ...@@ -390,7 +390,6 @@ enum {
OVER_LIMIT, OVER_LIMIT,
}; };
#ifdef CONFIG_INET
struct sock; struct sock;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
void sock_update_memcg(struct sock *sk); void sock_update_memcg(struct sock *sk);
...@@ -403,6 +402,5 @@ static inline void sock_release_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_CGROUP_MEM_RES_CTLR_KMEM */
#endif /* CONFIG_INET */
#endif /* _LINUX_MEMCONTROL_H */ #endif /* _LINUX_MEMCONTROL_H */
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/user_namespace.h> #include <linux/user_namespace.h>
#include <linux/jump_label.h> #include <linux/jump_label.h>
#include <linux/memcontrol.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment