From a5d38ca97f303764b20b5f4bdcd712e12e699136 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 29 Jul 2008 22:33:20 -0700
Subject: [PATCH] --- yaml --- r: 107001 b: refs/heads/master c:
 55b6fd0162ace1e0f1b52c8c092565c115127ef6 h: refs/heads/master i:   106999:
 6153336ed749c33ea42dd099e9ea1563d71d9a32 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0be74ef4eb2a..e5cc943b96b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36553434f475a84b653e25e74490ee8df43b86d5
+refs/heads/master: 55b6fd0162ace1e0f1b52c8c092565c115127ef6
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 249a517591b8..13932abde159 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -2368,7 +2368,7 @@ static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 	return cgroup_create(c_parent, dentry, mode | S_IFDIR);
 }
 
-static inline int cgroup_has_css_refs(struct cgroup *cgrp)
+static int cgroup_has_css_refs(struct cgroup *cgrp)
 {
 	/* Check the reference count on each subsystem. Since we
 	 * already established that there are no tasks in the