Message ID | 1449588624-9220-1-git-send-email-hannes@cmpxchg.org |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
From: Johannes Weiner <hannes@cmpxchg.org> Date: Tue, 8 Dec 2015 10:30:10 -0500 > Hi Andrew, > > there was some build breakage in CONFIG_ combinations I hadn't tested > in the last revision, so here is a fixed-up resend with minimal CC > list. The only difference to the previous version is a section in > memcontrol.h, but it accumulates throughout the series and would have > been a pain to resolve on your end. So here goes. This also includes > the review tags that Dave and Vlad had sent out in the meantime. > > Difference to the original v4: All looks fine to me: Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 08 December 2015 10:30:10 Johannes Weiner wrote: > Hi Andrew, > > there was some build breakage in CONFIG_ combinations I hadn't tested > in the last revision, so here is a fixed-up resend with minimal CC > list. The only difference to the previous version is a section in > memcontrol.h, but it accumulates throughout the series and would have > been a pain to resolve on your end. So here goes. This also includes > the review tags that Dave and Vlad had sent out in the meantime. > > Difference to the original v4: I needed two more patches on top of today's linux-next kernel, will send them as replies to this mail. I don't know if you have already fixed the issues for !CONFIG_INET and CONFIG_SLOB, if not please fold them into your series. Arnd -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hey Arnd! On Wed, Dec 09, 2015 at 05:31:38PM +0100, Arnd Bergmann wrote: > On Tuesday 08 December 2015 10:30:10 Johannes Weiner wrote: > > Hi Andrew, > > > > there was some build breakage in CONFIG_ combinations I hadn't tested > > in the last revision, so here is a fixed-up resend with minimal CC > > list. The only difference to the previous version is a section in > > memcontrol.h, but it accumulates throughout the series and would have > > been a pain to resolve on your end. So here goes. This also includes > > the review tags that Dave and Vlad had sent out in the meantime. > > > > Difference to the original v4: > > I needed two more patches on top of today's linux-next kernel, will > send them as replies to this mail. I don't know if you have already > fixed the issues for !CONFIG_INET and CONFIG_SLOB, if not please > fold them into your series. Sorry for breaking your stuff, and thanks for sending patches. I'll get to them in a minute and will make sure the fixes get routed to Andrew. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9a19590..189f04d 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -702,14 +702,14 @@ static inline void mem_cgroup_wb_stats(struct bdi_writeback *wb, #endif /* CONFIG_CGROUP_WRITEBACK */ -#ifdef CONFIG_INET struct sock; -extern struct static_key_false memcg_sockets_enabled_key; -#define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_enabled_key) void sock_update_memcg(struct sock *sk); void sock_release_memcg(struct sock *sk); bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages); void mem_cgroup_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages); +#if defined(CONFIG_MEMCG) && defined(CONFIG_INET) +extern struct static_key_false memcg_sockets_enabled_key; +#define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_enabled_key) static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) { #ifdef CONFIG_MEMCG_KMEM @@ -724,7 +724,11 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) } #else #define mem_cgroup_sockets_enabled 0 -#endif /* CONFIG_INET */ +static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) +{ + return false; +} +#endif #ifdef CONFIG_MEMCG_KMEM extern struct static_key_false memcg_kmem_enabled_key; diff --git a/include/linux/vmpressure.h b/include/linux/vmpressure.h index a77b142..3347cc3 100644 --- a/include/linux/vmpressure.h +++ b/include/linux/vmpressure.h @@ -43,7 +43,7 @@ extern int vmpressure_register_event(struct mem_cgroup *memcg, extern void vmpressure_unregister_event(struct mem_cgroup *memcg, struct eventfd_ctx *eventfd); #else -static inline void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, +static inline void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree, unsigned long scanned, unsigned long reclaimed) {} static inline void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio) {}