Messages in this thread Patch in this message | | | Date | Mon, 23 Nov 2009 11:51:47 GMT | From | tip-bot for Yinghai Lu <> | Subject | [tip:x86/apic] x86: apic: Remove not needed #ifdef |
| |
Commit-ID: e670761f12f4069d204f433bf547d9c679a4fd05 Gitweb: http://git.kernel.org/tip/e670761f12f4069d204f433bf547d9c679a4fd05 Author: Yinghai Lu <yinghai@kernel.org> AuthorDate: Sat, 21 Nov 2009 00:23:37 -0800 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 23 Nov 2009 09:54:15 +0100
x86: apic: Remove not needed #ifdef
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> --- arch/x86/kernel/apic/apic.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 4c689f4..ad8c75b 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -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) {
| |