From fbc59828e236d5d3f842ebcbe3400d7b6d96cff5 Mon Sep 17 00:00:00 2001 From: Kenji Kaneshige Date: Tue, 30 Nov 2010 22:22:28 -0800 Subject: [PATCH] --- yaml --- r: 223438 b: refs/heads/master c: 7f7fbf45c6b748074546f7f16b9488ca71de99c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/apic.c | 8 ++++++++ trunk/arch/x86/kernel/apic/probe_64.c | 7 ------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 133a0d4376fc..1e647bd1784f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 086e8ced65d9bcc4a8e8f1cd39b09640f2883f90 +refs/heads/master: 7f7fbf45c6b748074546f7f16b9488ca71de99c1 diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c index 3f838d537392..78218135b48e 100644 --- a/trunk/arch/x86/kernel/apic/apic.c +++ b/trunk/arch/x86/kernel/apic/apic.c @@ -1389,6 +1389,14 @@ void __cpuinit end_local_APIC_setup(void) setup_apic_nmi_watchdog(NULL); apic_pm_activate(); + + /* + * Now that local APIC setup is completed for BP, configure the fault + * handling for interrupt remapping. + */ + if (!smp_processor_id() && intr_remapping_enabled) + enable_drhd_fault_handling(); + } #ifdef CONFIG_X86_X2APIC diff --git a/trunk/arch/x86/kernel/apic/probe_64.c b/trunk/arch/x86/kernel/apic/probe_64.c index f9e4e6a54073..d8c4a6feb286 100644 --- a/trunk/arch/x86/kernel/apic/probe_64.c +++ b/trunk/arch/x86/kernel/apic/probe_64.c @@ -79,13 +79,6 @@ void __init default_setup_apic_routing(void) /* need to update phys_pkg_id */ apic->phys_pkg_id = apicid_phys_pkg_id; } - - /* - * Now that apic routing model is selected, configure the - * fault handling for intr remapping. - */ - if (intr_remapping_enabled) - enable_drhd_fault_handling(); } /* Same for both flat and physical. */