This is Mikael's version of Pavel's patch, fixed to let CONFIG_PM=n
compile. It works for me on my 2-way using oprofile.