summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2012-03-22 03:34:13 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 04:54:59 +0400
commitea48cf7863c789579b170ef28e7fc62728365d6e (patch)
tree3602d07d69e1b1b6d8a26f2b221705bb2862ee3c /mm
parent05af2e104a0c282dcd9303431e1360750ba76de6 (diff)
downloadlinux-ea48cf7863c789579b170ef28e7fc62728365d6e.tar.xz
mm, counters: fold __sync_task_rss_stat() into sync_mm_rss()
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@google.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 2d27239ce4dd..1e0561e1f190 100644
--- 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,12 +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);
-}
-
-void sync_mm_rss(struct mm_struct *mm)
-{
- __sync_task_rss_stat(mm);
+ sync_mm_rss(task->mm);
}
#else /* SPLIT_RSS_COUNTING */