diff options
| author | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /arch/powerpc/kernel/power5-pmu.c | |
| parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/powerpc/kernel/power5-pmu.c')
| -rw-r--r-- | arch/powerpc/kernel/power5-pmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/power5-pmu.c b/arch/powerpc/kernel/power5-pmu.c index 29b2c6c0e83a..867f6f663963 100644 --- a/arch/powerpc/kernel/power5-pmu.c +++ b/arch/powerpc/kernel/power5-pmu.c | |||
| @@ -618,7 +618,8 @@ static struct power_pmu power5_pmu = { | |||
| 618 | 618 | ||
| 619 | static int init_power5_pmu(void) | 619 | static int init_power5_pmu(void) |
| 620 | { | 620 | { |
| 621 | if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5")) | 621 | if (!cur_cpu_spec->oprofile_cpu_type || |
| 622 | strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5")) | ||
| 622 | return -ENODEV; | 623 | return -ENODEV; |
| 623 | 624 | ||
| 624 | return register_power_pmu(&power5_pmu); | 625 | return register_power_pmu(&power5_pmu); |