diff for duplicates of <20200627033346.uM9eRcQFS%akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index f231121..36f0352 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,3 +70,16 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> */ if (!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT)) return ep; +- +- if (parent_effective > siblings_protected && usage > protected) { ++ if (parent_effective > siblings_protected && ++ parent_usage > siblings_protected && ++ usage > protected) { + unsigned long unclaimed; + + unclaimed = parent_effective - siblings_protected; +_ + +Patches currently in -mm which might be from hannes@cmpxchg.org are + +mm-memcontrol-decouple-reference-counting-from-page-accounting.patch diff --git a/a/content_digest b/N1/content_digest index a61d5e3..64c90f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -82,6 +82,19 @@ "+\t * aren't read atomically - make sure the division is sane.\n" " \t */\n" " \tif (!(cgrp_dfl_root.flags & CGRP_ROOT_MEMORY_RECURSIVE_PROT))\n" - " \t\treturn ep;" + " \t\treturn ep;\n" + "-\n" + "-\tif (parent_effective > siblings_protected && usage > protected) {\n" + "+\tif (parent_effective > siblings_protected &&\n" + "+\t parent_usage > siblings_protected &&\n" + "+\t usage > protected) {\n" + " \t\tunsigned long unclaimed;\n" + " \n" + " \t\tunclaimed = parent_effective - siblings_protected;\n" + "_\n" + "\n" + "Patches currently in -mm which might be from hannes@cmpxchg.org are\n" + "\n" + mm-memcontrol-decouple-reference-counting-from-page-accounting.patch -78f7e8dd8b5309b6731dc08c8e3a254b2438e96f914579083f3968b6f27a1298 +fe7ccb4975065cb4e966a37591556c9718bb13369e0ae2aa12030132b170fbe1
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.