x86: actually merge <asm/alternative.h>