linux-next: build failure after merge of the cgroup tree

[Stephen Rothwell]

Hi Tejun,

After merging the cgroup tree, today's linux-next build (x86_64
allmodconfig) failed like this:

kernel/cgroup_freezer.c: In function 'freezer_can_attach':
kernel/cgroup_freezer.c:179:3: error: implicit declaration of function '__cgroup_freezing_or_frozen' [-Werror=implicit-function-declaration]

Caused by commit cfb5ec210751 ("cgroup: don't use subsys->can_attach_task
() or ->attach_task()") from the cgroup tree interacting with commit
22b4e111fa01 ("cgroup_freezer: prepare for removal of TIF_FREEZE") from
the pm tree.

I don't know how to fix this up (the obvious fix will cause us to have
nested rcu_read_lock()s and I have no idea if that is allowed).  Can you
please provide me with a merge resolution?   I am also wondering why such
closely related work is happening in 2 different trees.

I have used the cgroup tree from next-20111124 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature