| Date | Fri, 12 Aug 2011 14:04:48 -0700 | From | Greg KH <> | Subject | [63/90] sparc: Dont leave sparc_pmu_type NULL on sun4v. |
| |
3.0-stable review patch. If anyone has any objections, please let us know.
------------------
From: "David S. Miller" <davem@davemloft.net>
[ Upstream commit facfddef2c76110b8e321921f7e54518c3dd1579 ]
Otherwise we'll crash in the sparc perf init code.
Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- arch/sparc/kernel/cpu.c | 1 + 1 file changed, 1 insertion(+)
--- 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; } }
|