summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-27 20:25:57 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-27 20:25:57 -0700
commitfacfddef2c76110b8e321921f7e54518c3dd1579 (patch)
tree429d8943cfa793cfb17dbb55db3ad7eff3486aac /arch
parent95b6886526bb510b8370b625a49bc0ab3b8ff10f (diff)
downloadlinux-3.10-facfddef2c76110b8e321921f7e54518c3dd1579.tar.gz
linux-3.10-facfddef2c76110b8e321921f7e54518c3dd1579.tar.bz2
linux-3.10-facfddef2c76110b8e321921f7e54518c3dd1579.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 138dbbc8dc8..70f035c86c0 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;
}
}