On Tue 09-10-12 23:32:35, David Rientjes wrote:
> Commit e1aab161e013 ("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.
>
> Reported-by: Randy Dunlap <[email protected]>
> Signed-off-by: David Rientjes <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Thanks!
> ---
> Checking the logs, Randy reported this in an email to LKML on
> September 24 and didn't get a response...
>
> include/linux/memcontrol.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -396,7 +396,7 @@ enum {
> };
>
> struct sock;
> -#ifdef CONFIG_MEMCG_KMEM
> +#if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
> void sock_update_memcg(struct sock *sk);
> void sock_release_memcg(struct sock *sk);
> #else
> @@ -406,6 +406,6 @@ static inline void sock_update_memcg(struct sock *sk)
> static inline void sock_release_memcg(struct sock *sk)
> {
> }
> -#endif /* CONFIG_MEMCG_KMEM */
> +#endif /* CONFIG_INET && CONFIG_MEMCG_KMEM */
> #endif /* _LINUX_MEMCONTROL_H */
>
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to [email protected]. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"[email protected]";> [email protected] </a>
--
Michal Hocko
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
