From 77093451fc46f4d0e9d51eb2bca9f3e959ffb1da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 27 Jul 2012 12:01:32 -0700 Subject: [PATCH] fix for queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage-v3.patch --- ...rge-amounts-of-memory-barrier-related-damage-v3.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage-v3.patch b/queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage-v3.patch index 039e9e6c5e9..37c4d6e3594 100644 --- a/queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage-v3.patch +++ b/queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage-v3.patch @@ -101,9 +101,9 @@ Signed-off-by: Greg Kroah-Hartman mm/mempolicy.c | 28 +++++++++++++++++++------- mm/page_alloc.c | 33 +++++++++++++++++++++--------- mm/slab.c | 13 +++++++----- - mm/slub.c | 35 +++++++++++++++++++++----------- + mm/slub.c | 36 +++++++++++++++++++++------------ mm/vmscan.c | 2 - - 12 files changed, 133 insertions(+), 109 deletions(-) + 12 files changed, 133 insertions(+), 110 deletions(-) --- a/include/linux/cpuset.h +++ b/include/linux/cpuset.h @@ -555,7 +555,7 @@ Signed-off-by: Greg Kroah-Hartman /* * The defrag ratio allows a configuration of the tradeoffs between -@@ -1480,22 +1481,32 @@ static struct page *get_any_partial(stru +@@ -1480,23 +1481,32 @@ static struct page *get_any_partial(stru get_cycles() % 1024 > s->remote_node_defrag_ratio) return NULL; @@ -596,10 +596,11 @@ Signed-off-by: Greg Kroah-Hartman } } - } +- put_mems_allowed(); + } while (!put_mems_allowed(cpuset_mems_cookie)); - put_mems_allowed(); #endif return NULL; + } --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2251,7 +2251,6 @@ static unsigned long do_try_to_free_page -- 2.47.3