lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: apic: Remove not needed #ifdef

Browse Source 
Suresh made dmar_table_init() already have that protection.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B07A739.3030104@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu
2009-11-21 00:23:37 -08:00
committed by Ingo Molnar
parent e79c65a97c
commit e670761f12
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/apic/apic.c
View File

@@ -1377,14 +1377,11 @@ void __init enable_IR_x2apic(void)
unsigned long flags; unsigned long flags;
struct IO_APIC_route_entry **ioapic_entries = NULL; struct IO_APIC_route_entry **ioapic_entries = NULL;
int ret, x2apic_enabled = 0; 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(); dmar_table_init_ret = dmar_table_init();
if (dmar_table_init_ret) if (dmar_table_init_ret && !x2apic_supported())
pr_debug("dmar_table_init() failed with %d:\n", return;
dmar_table_init_ret);
#endif
ioapic_entries = alloc_ioapic_entries(); ioapic_entries = alloc_ioapic_entries();
if (!ioapic_entries) { if (!ioapic_entries) {