x86: remove not needed ifdef in enable_IR_x2apic
PATCH 1/1 x86: remove not needed ifdef in enable_IR_x2apic
Suresh pointed out dmar_table_init() already have that protection
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/apic/apic.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/x86/kernel/apic/apic.c +3 -6
@@ -1392,14 +1392,11 @@ void __init enable_IR_x2apic(void)unsigned long flags;struct IO_APIC_route_entry **ioapic_entries =NULL ;int ret, x2apic_enabled =0 ; -int dmar_table_init_ret =0 ; +int dmar_table_init_ret; -#ifdef CONFIG_INTR_REMAP dmar_table_init_ret =dmar_table_init (); -if (dmar_table_init_ret) -pr_debug ("dmar_table_init() failed with %d:\n" , - dmar_table_init_ret); -#endif +if (dmar_table_init_ret && !x2apic_supported ()) +return ; ioapic_entries =alloc_ioapic_entries ();if (!ioapic_entries) {