x86, apic: fix build fallout of genapic changes