summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-02-23 15:24:11 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-23 17:13:24 -0800
commit8d53d55d27754508e58e9ac18a4a445b110434bf (patch)
tree01bca7d82eb92c8e199c44ec37e7a70bb0a4a898 /kernel
parentf777073848ba3708d68d87e43f104f83316187d7 (diff)
downloadop-kernel-dev-8d53d55d27754508e58e9ac18a4a445b110434bf.zip
op-kernel-dev-8d53d55d27754508e58e9ac18a4a445b110434bf.tar.gz
cgroup: fix subsys bitops
Cgroup uses unsigned long for subsys bitops, not unsigned long long. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 947fe3b..8412593 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -319,7 +319,7 @@ static struct css_set *find_existing_css_set(
/* Built the set of subsystem state objects that we want to
* see in the new css_set */
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
- if (root->subsys_bits & (1ull << i)) {
+ if (root->subsys_bits & (1UL << i)) {
/* Subsystem is in this hierarchy. So we want
* the subsystem state from the new
* cgroup */
@@ -689,7 +689,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
added_bits = final_bits & ~root->actual_subsys_bits;
/* Check that any added subsystems are currently free */
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
- unsigned long long bit = 1ull << i;
+ unsigned long bit = 1UL << i;
struct cgroup_subsys *ss = subsys[i];
if (!(bit & added_bits))
continue;
OpenPOWER on IntegriCloud