---

yaml --- r: 188843 b: refs/heads/master c: a90110c h: refs/heads/master i: 188841: 3efb37c 188839: 77e3a5f v: v3
git-mirror · Mar 22, 2010 · f7eb19c · f7eb19c
1 parent 61550ff
commit f7eb19c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 220bf991b0366cc50a94feede3d7341fa5710ee4
+refs/heads/master: a90110c61073eab95d1986322693c2b9a8a6a5f6
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd.c b/trunk/arch/x86/kernel/cpu/perf_event_amd.c
@@ -348,10 +348,12 @@ static void amd_pmu_cpu_offline(int cpu)
 
 	raw_spin_lock(&amd_nb_lock);
 
-	if (--cpuhw->amd_nb->refcnt == 0)
-		kfree(cpuhw->amd_nb);
+	if (cpuhw->amd_nb) {
+		if (--cpuhw->amd_nb->refcnt == 0)
+			kfree(cpuhw->amd_nb);
 
-	cpuhw->amd_nb = NULL;
+		cpuhw->amd_nb = NULL;
+	}
 
 	raw_spin_unlock(&amd_nb_lock);
 }