Merge branch 'x86/urgent' into x86/asm

Get the cr4 fixes so we can apply the final cleanup