From 9110930282ba8e7d9c7b8ddccf7b60f73050c752 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Sat, 23 Feb 2008 15:24:11 -0800 Subject: [PATCH] --- yaml --- r: 86246 b: refs/heads/master c: 8d53d55d27754508e58e9ac18a4a445b110434bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dce948a23bd7..537a20795bb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f777073848ba3708d68d87e43f104f83316187d7 +refs/heads/master: 8d53d55d27754508e58e9ac18a4a445b110434bf diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c index 947fe3b22182..841259361724 100644 --- a/trunk/kernel/cgroup.c +++ b/trunk/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;