From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 22 Dec 2010 10:53:20 +0000 (+0100)
Subject: Merge commit 'v2.6.37-rc7' into perf/core
X-Git-Tag: v2.6.38-rc1~2^2~59
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c529a266bdc590a870ee2d2092ff6527eff427b;p=linux-2.6-block.git

Merge commit 'v2.6.37-rc7' into perf/core

Merge reason: Pick up the latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

6c529a266bdc590a870ee2d2092ff6527eff427b
diff --cc arch/x86/kernel/apic/apic.c
index e9e2a93783f9,78218135b48e..fb7657822aad
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -1382,7 -1387,16 +1382,15 @@@ void __cpuinit end_local_APIC_setup(voi
  	}
  #endif
  
 -	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