---

yaml --- r: 191088 b: refs/heads/master c: 8576e19 h: refs/heads/master v: v3
git-mirror · Mar 13, 2010 · 25ccb54 · 25ccb54
1 parent 465edd7
commit 25ccb54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 567e54790e5c07152a93b6de4d0210af8b77da87
+refs/heads/master: 8576e1971663ffdb6139041de97cdd2e1d4791cc
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_p4.c b/trunk/arch/x86/kernel/cpu/perf_event_p4.c
@@ -365,8 +365,10 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
 	}
 
 	if (handled) {
+#ifdef CONFIG_X86_LOCAL_APIC
 		/* p4 quirk: unmask it again */
 		apic_write(APIC_LVTPC, apic_read(APIC_LVTPC) & ~APIC_LVT_MASKED);
+#endif
 		inc_irq_stat(apic_perf_irqs);
 	}