x86, apic: Fix missed handling of discrete apics