x86: prepare unification of include/asm-x86/apic_32/64.h