From 9cd96d8297ea8826b75de68731e6bc664cec89e1 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Wed, 10 Mar 2010 15:20:38 -0800
Subject: [PATCH] --- yaml --- r: 187116 b: refs/heads/master c:
 53bddb4e9f3f53df02a783751984ddeade71b085 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/mm.h       | 6 ++++++
 trunk/include/linux/mm_types.h | 2 +-
 trunk/mm/memory.c              | 3 ---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5c9f09403a65..9fbcd27aad54 100644
--- 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
index 3899395a03de..7f693b272c4a 100644
--- 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
index 048b46270aa5..b8bb9a6a1f37 100644
--- 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
index d1153e37e9ba..3d9130bd95d0 100644
--- 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
 
 /*