x86/apic: Fix fallout from x2apic cleanup