upstream kernel fixes

Fixes for kpatch-build so that it builds with the latest upstream kernel.