| commit | facfddef2c76110b8e321921f7e54518c3dd1579 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Jul 27 20:25:57 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jul 27 20:25:57 2011 -0700 |
| tree | 429d8943cfa793cfb17dbb55db3ad7eff3486aac | |
| parent | 95b6886526bb510b8370b625a49bc0ab3b8ff10f [diff] |
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 138dbbc..70f035c 100644 --- a/arch/sparc/kernel/cpu.c +++ b/arch/sparc/kernel/cpu.c
@@ -479,6 +479,7 @@ prom_cpu_compatible); sparc_cpu_type = "Unknown SUN4V CPU"; sparc_fpu_type = "Unknown SUN4V FPU"; + sparc_pmu_type = "Unknown SUN4V PMU"; break; } }