diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-07 01:27:01 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-07 01:27:01 -0500 |
| commit | 52aeed7bc50cf5532b07ab0cb4fc50f20bbc71c2 (patch) | |
| tree | e4aae32979a98d147cd0e45d54c6c7614f9296f7 | |
| parent | 6a6d0652ce1d18d6f2a5405b3d9a4e6c4472e397 (diff) | |
| download | rt-patches-52aeed7bc50cf5532b07ab0cb4fc50f20bbc71c2.tar.gz | |
refresh mm-memcontrol-preemption-fix.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | mm-memcontrol-preemption-fix.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/mm-memcontrol-preemption-fix.patch b/mm-memcontrol-preemption-fix.patch index 9322d7d..dce2457 100644 --- a/mm-memcontrol-preemption-fix.patch +++ b/mm-memcontrol-preemption-fix.patch @@ -1,4 +1,4 @@ -From 155501b42e8b163b27609a5076615eed44e3faca Mon Sep 17 00:00:00 2001 +From 3d235e3c6b3f0069e3d7ca9b458bd63db070bb7f 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 @@ -24,32 +24,30 @@ Call Trace: RT needs to disable preemption explicitely here. +[PG: change get_cpu() -> preempt_disable() due to upstream c62b1a3b31] + Signed-off-by: Carsten Emde <carsten.emde@osadl.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 954032b..d3e716f 100644 +index 7973b52..24554f5 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -1258,13 +1258,15 @@ void mem_cgroup_update_file_mapped(struct page *page, int val) +@@ -1366,9 +1366,12 @@ void mem_cgroup_update_file_mapped(struct page *page, int val) goto done; /* -- * Preemption is already disabled, we don't need get_cpu() -+ * Preemption is already disabled, we don't need get_cpu(), +- * Preemption is already disabled. We can use __this_cpu_xxx ++ * Preemption is already disabled. We can use __this_cpu_xxx, + * but that's not true for RT ! */ -- cpu = smp_processor_id(); -+ cpu = get_cpu(); - stat = &mem->stat; - cpustat = &stat->cpustat[cpu]; ++ preempt_disable(); + __this_cpu_add(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED], val); ++ preempt_enable(); - __mem_cgroup_stat_add_safe(cpustat, MEM_CGROUP_STAT_FILE_MAPPED, val); -+ put_cpu(); done: unlock_page_cgroup(pc); - } -- 1.7.1.1 |