diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /arch/x86/kernel/apic/apic.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index e3b534cda49a..e0f220e158c1 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
| @@ -1340,6 +1340,14 @@ void __cpuinit end_local_APIC_setup(void) | |||
| 1340 | 1340 | ||
| 1341 | setup_apic_nmi_watchdog(NULL); | 1341 | setup_apic_nmi_watchdog(NULL); |
| 1342 | apic_pm_activate(); | 1342 | apic_pm_activate(); |
| 1343 | |||
| 1344 | /* | ||
| 1345 | * Now that local APIC setup is completed for BP, configure the fault | ||
| 1346 | * handling for interrupt remapping. | ||
| 1347 | */ | ||
| 1348 | if (!smp_processor_id() && intr_remapping_enabled) | ||
| 1349 | enable_drhd_fault_handling(); | ||
| 1350 | |||
| 1343 | } | 1351 | } |
| 1344 | 1352 | ||
| 1345 | #ifdef CONFIG_X86_X2APIC | 1353 | #ifdef CONFIG_X86_X2APIC |