---

yaml --- r: 191085 b: refs/heads/master c: 0b86122 h: refs/heads/master i: 191083: 954bf9d v: v3
git-mirror · Mar 12, 2010 · c6fa34b · c6fa34b
1 parent cb08a37
commit c6fa34b
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: a072738e04f0eb26370e39ec679e9a0d65e49aea
+refs/heads/master: 0b861225a5890f22445f08ca9cc7a87cff276ff7
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -1269,6 +1269,9 @@ int hw_perf_group_sched_in(struct perf_event *leader,
 	int assign[X86_PMC_IDX_MAX];
 	int n0, n1, ret;
 
+	if (!x86_pmu_initialized())
+		return 0;
+
 	/* n0 = total number of events */
 	n0 = collect_events(cpuc, leader, true);
 	if (n0 < 0)