x86: prepare merger of <asm/alternative_{32,64}.h>