diff options
| author | James Morris <jmorris@namei.org> | 2009-08-11 00:33:01 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-11 00:33:01 +0200 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /arch/powerpc/kernel/power4-pmu.c | |
| parent | mm_for_maps: take ->cred_guard_mutex to fix the race with exec (diff) | |
| parent | pty: fix data loss when stopped (^S/^Q) (diff) | |
| download | linux-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.tar.xz linux-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/powerpc/kernel/power4-pmu.c')
| -rw-r--r-- | arch/powerpc/kernel/power4-pmu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/power4-pmu.c b/arch/powerpc/kernel/power4-pmu.c index db90b0c5c27b..3c90a3d9173e 100644 --- a/arch/powerpc/kernel/power4-pmu.c +++ b/arch/powerpc/kernel/power4-pmu.c @@ -606,7 +606,8 @@ static struct power_pmu power4_pmu = { static int init_power4_pmu(void) { - if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4")) + if (!cur_cpu_spec->oprofile_cpu_type || + strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4")) return -ENODEV; return register_power_pmu(&power4_pmu); |