From 5a8dad1929a084a0377c356dee301fb6474c65d7 Mon Sep 17 00:00:00 2001
From: Daisuke Nishimura <d-nishimura@mtf.biglobe.ne.jp>
Date: Tue, 23 Mar 2010 13:35:11 -0700
Subject: [PATCH] --- yaml --- r: 188895 b: refs/heads/master c:
 5cfb80a73b5a52fb19d8b0611203e4dd58e8e9a2 h: refs/heads/master i:   188893:
 f8dd436ac25844b48a70c7c792de5d56234524bf   188891:
 277d7d48e3e2496c32666046163c617d21e99fec   188887:
 809d0e7acfa6d177f30367d367619702ed40046d   188879:
 467ecff081dafc00764808657e44777e7bd646e5   188863:
 9449553526b0f7b0638774d3aab1676718d57695 v: v3

---
 [refs]                |  2 +-
 trunk/mm/memcontrol.c | 44 +++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index f3346a16625a..6a6440a0aa3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae6be51ed01d6c4aaf249a207b4434bc7785853b
+refs/heads/master: 5cfb80a73b5a52fb19d8b0611203e4dd58e8e9a2
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 7973b5221fb8..00dda352144c 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -3946,28 +3946,6 @@ static int mem_cgroup_do_precharge(unsigned long count)
 	}
 	return ret;
 }
-#else	/* !CONFIG_MMU */
-static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
-				struct cgroup *cgroup,
-				struct task_struct *p,
-				bool threadgroup)
-{
-	return 0;
-}
-static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
-				struct cgroup *cgroup,
-				struct task_struct *p,
-				bool threadgroup)
-{
-}
-static void mem_cgroup_move_task(struct cgroup_subsys *ss,
-				struct cgroup *cont,
-				struct cgroup *old_cont,
-				struct task_struct *p,
-				bool threadgroup)
-{
-}
-#endif
 
 /**
  * is_target_pte_for_mc - check a pte whether it is valid for move charge
@@ -4330,6 +4308,28 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
 	}
 	mem_cgroup_clear_mc();
 }
+#else	/* !CONFIG_MMU */
+static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
+				struct cgroup *cgroup,
+				struct task_struct *p,
+				bool threadgroup)
+{
+	return 0;
+}
+static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
+				struct cgroup *cgroup,
+				struct task_struct *p,
+				bool threadgroup)
+{
+}
+static void mem_cgroup_move_task(struct cgroup_subsys *ss,
+				struct cgroup *cont,
+				struct cgroup *old_cont,
+				struct task_struct *p,
+				bool threadgroup)
+{
+}
+#endif
 
 struct cgroup_subsys mem_cgroup_subsys = {
 	.name = "memory",