---

yaml --- r: 166438 b: refs/heads/master c: 7d42896 h: refs/heads/master v: v3
git-mirror · Sep 23, 2009 · dcfc62d · dcfc62d
1 parent b9c5f9e
commit dcfc62d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6f10a2f5d8c2738b3ac05974bdbea3b68a2aecd
+refs/heads/master: 7d42896628202a551ad1107697cd215dc5fca099
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -1790,6 +1790,9 @@ void smp_perf_pending_interrupt(struct pt_regs *regs)
 void set_perf_event_pending(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
+	if (!x86_pmu.apic || !x86_pmu_initialized())
+		return;
+
 	apic->send_IPI_self(LOCAL_PENDING_VECTOR);
 #endif
 }