Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e670761f authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: apic: Remove not needed #ifdef 



Suresh made dmar_table_init() already have that protection.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B07A739.3030104@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e79c65a9

arch/x86/kernel/apic/apic.c

+3 −6
Original line number Diff line number Diff line
@@ -1377,14 +1377,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) {