diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2008-02-23 18:24:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-23 20:13:24 -0500 |
commit | 8d53d55d27754508e58e9ac18a4a445b110434bf (patch) | |
tree | 01bca7d82eb92c8e199c44ec37e7a70bb0a4a898 /kernel | |
parent | f777073848ba3708d68d87e43f104f83316187d7 (diff) |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 947fe3b2218..84125936172 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -319,7 +319,7 @@ static struct css_set *find_existing_css_set( | |||
319 | /* Built the set of subsystem state objects that we want to | 319 | /* Built the set of subsystem state objects that we want to |
320 | * see in the new css_set */ | 320 | * see in the new css_set */ |
321 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { | 321 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { |
322 | if (root->subsys_bits & (1ull << i)) { | 322 | if (root->subsys_bits & (1UL << i)) { |
323 | /* Subsystem is in this hierarchy. So we want | 323 | /* Subsystem is in this hierarchy. So we want |
324 | * the subsystem state from the new | 324 | * the subsystem state from the new |
325 | * cgroup */ | 325 | * cgroup */ |
@@ -689,7 +689,7 @@ static int rebind_subsystems(struct cgroupfs_root *root, | |||
689 | added_bits = final_bits & ~root->actual_subsys_bits; | 689 | added_bits = final_bits & ~root->actual_subsys_bits; |
690 | /* Check that any added subsystems are currently free */ | 690 | /* Check that any added subsystems are currently free */ |
691 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { | 691 | for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) { |
692 | unsigned long long bit = 1ull << i; | 692 | unsigned long bit = 1UL << i; |
693 | struct cgroup_subsys *ss = subsys[i]; | 693 | struct cgroup_subsys *ss = subsys[i]; |
694 | if (!(bit & added_bits)) | 694 | if (!(bit & added_bits)) |
695 | continue; | 695 | continue; |