[PATCH] i386, apic: clean up the APIC code