x86/apic: Fix silent & fatal merge conflict in __generic_processor_info()