From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 30 Jul 2012 17:18:44 +0000 (-0700)
Subject: fix up queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage... 
X-Git-Tag: v3.0.39~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26c597684bfee6f2f97d47dbc6709f26163f17dc;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-3.0/cpuset-mm-reduce-large-amounts-of-memory-barrier-related-damage-v3.patch again...
---

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 37c4d6e3594..36530774514 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
@@ -91,23 +91,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 
 ---
- include/linux/cpuset.h    |   49 ++++++++++++++++++----------------------------
+ include/linux/cpuset.h    |   51 +++++++++++++++++++---------------------------
  include/linux/init_task.h |    8 +++++++
  include/linux/sched.h     |    2 -
- kernel/cpuset.c           |   43 +++++++---------------------------------
+ kernel/cpuset.c           |   43 +++++++-------------------------------
  kernel/fork.c             |    3 ++
- mm/filemap.c              |   11 ++++++----
- mm/hugetlb.c              |   15 ++++++++++----
- mm/mempolicy.c            |   28 +++++++++++++++++++-------
- mm/page_alloc.c           |   33 +++++++++++++++++++++---------
- mm/slab.c                 |   13 +++++++-----
- mm/slub.c                 |   36 +++++++++++++++++++++------------
+ mm/filemap.c              |   11 ++++++---
+ mm/hugetlb.c              |   15 +++++++++----
+ mm/mempolicy.c            |   28 ++++++++++++++++++-------
+ mm/page_alloc.c           |   33 ++++++++++++++++++++---------
+ mm/slab.c                 |   13 +++++++----
+ mm/slub.c                 |   36 ++++++++++++++++++++------------
  mm/vmscan.c               |    2 -
- 12 files changed, 133 insertions(+), 110 deletions(-)
+ 12 files changed, 135 insertions(+), 110 deletions(-)
 
 --- a/include/linux/cpuset.h
 +++ b/include/linux/cpuset.h
-@@ -89,36 +89,25 @@ extern void rebuild_sched_domains(void);
+@@ -89,42 +89,33 @@ extern void rebuild_sched_domains(void);
  extern void cpuset_print_task_mems_allowed(struct task_struct *p);
  
  /*
@@ -160,7 +160,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-@@ -234,12 +223,14 @@ static inline void set_mems_allowed(node
+ {
+ 	task_lock(current);
++	write_seqcount_begin(&current->mems_allowed_seq);
+ 	current->mems_allowed = nodemask;
++	write_seqcount_end(&current->mems_allowed_seq);
+ 	task_unlock(current);
+ }
+ 
+@@ -234,12 +225,14 @@ static inline void set_mems_allowed(node
  {
  }