refresh mm-memcontrol-preemption-fix.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm-memcontrol-preemption-fix.patch b/mm-memcontrol-preemption-fix.patch
index dce2457..4119098 100644
--- a/mm-memcontrol-preemption-fix.patch
+++ b/mm-memcontrol-preemption-fix.patch
@@ -1,4 +1,4 @@
-From 3d235e3c6b3f0069e3d7ca9b458bd63db070bb7f Mon Sep 17 00:00:00 2001
+From bb89e38ca6a2f72d70b4b4c89359a18c8cb31659 Mon Sep 17 00:00:00 2001
From: Carsten Emde <c.emde@osadl.org>
Date: Tue, 21 Jul 2009 18:58:20 +0200
Subject: [PATCH] mm: memcontrol preemption fix
@@ -31,10 +31,10 @@
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 7973b52..24554f5 100644
+index f4ede99..2c5b6d6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
-@@ -1366,9 +1366,12 @@ void mem_cgroup_update_file_mapped(struct page *page, int val)
+@@ -1363,8 +1363,10 @@ void mem_cgroup_update_file_mapped(struct page *page, int val)
goto done;
/*
@@ -43,7 +43,13 @@
+ * but that's not true for RT !
*/
+ preempt_disable();
- __this_cpu_add(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED], val);
+ if (val > 0) {
+ __this_cpu_inc(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
+ SetPageCgroupFileMapped(pc);
+@@ -1372,6 +1374,7 @@ void mem_cgroup_update_file_mapped(struct page *page, int val)
+ __this_cpu_dec(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
+ ClearPageCgroupFileMapped(pc);
+ }
+ preempt_enable();
done:
