From 751e1b65dae999c152f2e2e0bd01107d4b81ff43 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Wed, 21 Mar 2012 16:34:13 -0700 Subject: [PATCH] --- yaml --- r: 292663 b: refs/heads/master c: ea48cf7863c789579b170ef28e7fc62728365d6e h: refs/heads/master i: 292661: 403a65bc483023fb903bf2969426e55871e395ac 292659: 3504684e1d12d08b7da10ad55c9a6c9bf01ba38b 292655: b00db001f8356f128bf49ffa188efdab9c7043d7 v: v3 --- [refs] | 2 +- trunk/mm/memory.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 202f3878daf2..0ebf89ef296a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05af2e104a0c282dcd9303431e1360750ba76de6 +refs/heads/master: ea48cf7863c789579b170ef28e7fc62728365d6e diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 2d27239ce4dd..1e0561e1f190 100644 --- a/trunk/mm/memory.c +++ b/trunk/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 */