---

yaml --- r: 187116 b: refs/heads/master c: 53bddb4 h: refs/heads/master v: v3
git-mirror · Mar 12, 2010 · 9cd96d8 · 9cd96d8
1 parent 18f76f8
commit 9cd96d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 936ed49a540e2dce645da27e7e4032b24310a8e4
+refs/heads/master: 53bddb4e9f3f53df02a783751984ddeade71b085
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
@@ -971,7 +971,13 @@ static inline void setmax_mm_hiwater_rss(unsigned long *maxrss,
 		*maxrss = hiwater_rss;
 }
 
+#if defined(SPLIT_RSS_COUNTING)
 void sync_mm_rss(struct task_struct *task, struct mm_struct *mm);
+#else
+static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
+{
+}
+#endif
 
 /*
  * A callback you can register to apply pressure to ageable caches.

diff --git a/trunk/include/linux/mm_types.h b/trunk/include/linux/mm_types.h
@@ -203,7 +203,7 @@ enum {
 	NR_MM_COUNTERS
 };
 
-#if USE_SPLIT_PTLOCKS
+#if USE_SPLIT_PTLOCKS && defined(CONFIG_MMU)
 #define SPLIT_RSS_COUNTING
 struct mm_rss_stat {
 	atomic_long_t count[NR_MM_COUNTERS];

diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -190,9 +190,6 @@ static void check_sync_rss_stat(struct task_struct *task)
 {
 }
 
-void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
-{
-}
 #endif
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -190,9 +190,6 @@ static void check_sync_rss_stat(struct task_struct *task) @@
     {
     }
-    void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
-    {
-    }
     #endif
     /*
@@ Expand Down @@