Merge branch 'x86/asm/urgent' to pick up an entry code fix