[folded-merged] mm-memcg-decouple-elowmin-state-mutations-from-protection-checks-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-memcg-decouple-elowmin-state-mutations-from-protection-checks-fix
has been removed from the -mm tree.  Its filename was
     mm-memcg-decouple-elowmin-state-mutations-from-protection-checks-fix.patch

This patch was dropped because it was folded into mm-memcg-decouple-elowmin-state-mutations-from-protection-checks.patch

------------------------------------------------------
From: Chris Down <chris@xxxxxxxxxxxxxx>
Subject: mm-memcg-decouple-elowmin-state-mutations-from-protection-checks-fix

CONFIG_MEMCG=n build fixes

Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/memcontrol.h |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

--- a/include/linux/memcontrol.h~mm-memcg-decouple-elowmin-state-mutations-from-protection-checks-fix
+++ a/include/linux/memcontrol.h
@@ -847,17 +847,12 @@ static inline void memcg_memory_event_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,
+static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
 					 bool in_low_reclaim)
 {
 	return 0;
_

Patches currently in -mm which might be from chris@xxxxxxxxxxxxxx are

mm-memcg-decouple-elowmin-state-mutations-from-protection-checks.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux