Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d53d55d authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds
Browse files

cgroup: fix subsys bitops 



Cgroup uses unsigned long for subsys bitops, not unsigned long long.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarPaul Menage <menage@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f7770738

kernel/cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -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;