From: Andi Kleen <ak@suse.de>

Some recent subarch interface changes caused macro redefinition warnings
for GET_APIC_ID and APIC_ID_MASK with the generic subarchitecture.  Fixing
it properly required some reorganization by giving the generic arch a
mach_apicdef.h too.