diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-12 22:48:01 -0400 |
| commit | e290861f99131fc42d98012a9ea2dc185f08f8f9 (patch) | |
| tree | 5c8b92d095d74d03b281711c81bac54bd59989cd /arch/powerpc/kernel/power7-pmu.c | |
| parent | b4a757367d36cebddcd332a4024d92f1e87af370 (diff) | |
| parent | dbefd606a3b3634799b625f4900336e61c89e868 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/powerpc/kernel/power7-pmu.c')
| -rw-r--r-- | arch/powerpc/kernel/power7-pmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index 5a9f5cbd40a4..388cf57ad827 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c | |||
| @@ -366,7 +366,8 @@ static struct power_pmu power7_pmu = { | |||
| 366 | 366 | ||
| 367 | static int init_power7_pmu(void) | 367 | static int init_power7_pmu(void) |
| 368 | { | 368 | { |
| 369 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7")) | 369 | if (!cur_cpu_spec->oprofile_cpu_type || |
| 370 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power7")) | ||
| 370 | return -ENODEV; | 371 | return -ENODEV; |
| 371 | 372 | ||
| 372 | return register_power_pmu(&power7_pmu); | 373 | return register_power_pmu(&power7_pmu); |