Comment 21 for bug 2060217

I've noticed that Vasily's commit has meanwhile landed in linux-next,
so I took it from there and applied it to noble master-next,
but it failed due to changed context.
Hence I did a bit of backporting work and got now it in.

I triggered appropriate kernel test builds here:
https://launchpad.net/~fheimes/+archive/ubuntu/lp2060217