From f7eb19c4f43c7c8c9148e6d84ab9f98cdaea485f Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sun, 21 Mar 2010 21:51:51 +0100 Subject: [PATCH] --- yaml --- r: 188843 b: refs/heads/master c: a90110c61073eab95d1986322693c2b9a8a6a5f6 h: refs/heads/master i: 188841: 3efb37c89a889b452252dc1598fe9b24b8230c22 188839: 77e3a5f778a253ec13c502379fba3e63b879808a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/perf_event_amd.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0ff3fd3796d5..ed29e3dd53f4 100644 --- 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 index 573458f1caf2..b87e0b6970cb 100644 --- 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); }