diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /arch/powerpc/kernel/power7-pmu.c | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
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); |