Merge branch 'x86/asm' into x86/apic

Pick up dependent changes to avoid merge conflicts