[patch 2/2] mm, counters: fold __sync_task_rss_stat intosync_mm_rss

From: David Rientjes
Date: Tue Mar 06 2012 - 22:21:43 EST


There's no difference between sync_mm_rss() and __sync_task_rss_stat(),
so fold the latter into the former.

Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx>
---
mm/memory.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -125,7 +125,7 @@ core_initcall(init_zero_pfn);

#if defined(SPLIT_RSS_COUNTING)

-static void __sync_task_rss_stat(struct mm_struct *mm)
+void sync_mm_rss(struct mm_struct *mm)
{
int i;

@@ -157,7 +157,7 @@ static void check_sync_rss_stat(struct task_struct *task)
if (unlikely(task != current))
return;
if (unlikely(task->rss_stat.events++ > TASK_RSS_EVENTS_THRESH))
- __sync_task_rss_stat(task->mm);
+ sync_mm_rss(task->mm);
}

unsigned long get_mm_counter(struct mm_struct *mm, int member)
@@ -177,11 +177,6 @@ unsigned long get_mm_counter(struct mm_struct *mm, int member)
return 0;
return (unsigned long)val;
}
-
-void sync_mm_rss(struct mm_struct *mm)
-{
- __sync_task_rss_stat(mm);
-}
#else /* SPLIT_RSS_COUNTING */

#define inc_mm_counter_fast(mm, member) inc_mm_counter(mm, member)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/