GCC 4.7 fixes

Conflicts:

	kernel/cgroup.c
silence GCC 4.7 compile warning