From: David S. Miller <davem@davemloft.net>
Date: Thu, 28 Jul 2011 03:25:57 +0000 (-0700)
Subject: sparc: Don't leave sparc_pmu_type NULL on sun4v.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=facfddef2c76110b8e321921f7e54518c3dd1579;p=linux-beck.git

sparc: Don't leave sparc_pmu_type NULL on sun4v.

Otherwise we'll crash in the sparc perf init code.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 138dbbc8dc84..70f035c86c03 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -479,6 +479,7 @@ static void __init sun4v_cpu_probe(void)
 		       prom_cpu_compatible);
 		sparc_cpu_type = "Unknown SUN4V CPU";
 		sparc_fpu_type = "Unknown SUN4V FPU";
+		sparc_pmu_type = "Unknown SUN4V PMU";
 		break;
 	}
 }