Merge branch 'linus' into x86/build to pick up dependencies

[linux-2.6-microblaze.git] / kernel / cgroup / cpuset.c

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index f7efa7b..b42037e 100644 (file)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1254,9 +1254,9 @@ done:
        return retval;
 }
 
-int current_cpuset_is_being_rebound(void)
+bool current_cpuset_is_being_rebound(void)
 {
-       int ret;
+       bool ret;
 
        rcu_read_lock();
        ret = task_cs(current) == cpuset_being_rebound;