diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-27 20:25:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:40 -0700 |
| commit | 29ad8f6f0b0e6e4c918040286572fffb662a5f88 (patch) | |
| tree | d7cb1e68b34f0a70acee455020c2312477c87fef /arch | |
| parent | fb07bb91081d60b29b3eb1372fc0e61ded2be352 (diff) | |
| download | lwn-29ad8f6f0b0e6e4c918040286572fffb662a5f88.tar.gz lwn-29ad8f6f0b0e6e4c918040286572fffb662a5f88.zip | |
sparc: Don't leave sparc_pmu_type NULL on sun4v.
[ 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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } } |