x86: <asm/asm.h> consistency cleanups