Re: [hnaz-linux-mm:master 80/408] include/linux/memcontrol.h:863:9: warning: 'return' with a value, in function returning void

[Chris Down <chris@xxxxxxxxxxxxxx>]

Huh, somehow the !CONFIG_MEMCG case got mangled in the final version sent 
upstream...

Andrew, can you please apply this fixup to 
mm-memcg-decouple-elowmin-state-mutations-from-protection-checks.patch? Thank 
you! :-)

diff --git include/linux/memcontrol.h include/linux/memcontrol.h
index 200693484afe..277c8a6a1c38 100644
--- include/linux/memcontrol.h
+++ include/linux/memcontrol.h
@@ -847,18 +847,13 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm,
 {
 }
 
-static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
-						  bool in_low_reclaim)
-{
-
-
 static inline void mem_cgroup_calculate_protection(struct mem_cgroup *root,
-						   struct mem_cgroup *memcg);
+						   struct mem_cgroup *memcg)
 {
 }
 
-static inline void mem_cgroup_protection(struct mem_cgroup *memcg,
-					 bool in_low_reclaim)
+static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
+						  bool in_low_reclaim)
 {
 	return 0;
 }