| Message ID | CAK9yfHyLZECDd=aSL9F4PdDs_QpOZqyDrY3bic8cPQfaTrqkgg@mail.gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 795e525..d5e76f5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -413,7 +413,6 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *s) /* Writing them here to avoid exposing memcg's inner layout */ #ifdef CONFIG_MEMCG_KMEM -#include <net/sock.h> #include <net/ip.h>
net/sock.h is included unconditionally at the beginning of the file. Hence, another conditional include is not required. Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Cc: Balbir Singh <bsingharora@gmail.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- mm/memcontrol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) static bool mem_cgroup_is_root(struct mem_cgroup *memcg); -- 1.7.4.1