git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf: Do the big rename: Performance Counters -> Performance Events
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
kernel
/
mpc7450-pmu.c
diff --git
a/arch/powerpc/kernel/mpc7450-pmu.c
b/arch/powerpc/kernel/mpc7450-pmu.c
index
c244133
..
09d7202
100644
(file)
--- a/
arch/powerpc/kernel/mpc7450-pmu.c
+++ b/
arch/powerpc/kernel/mpc7450-pmu.c
@@
-9,7
+9,7
@@
* 2 of the License, or (at your option) any later version.
*/
#include <linux/string.h>
* 2 of the License, or (at your option) any later version.
*/
#include <linux/string.h>
-#include <linux/perf_
counter
.h>
+#include <linux/perf_
event
.h>
#include <asm/reg.h>
#include <asm/cputable.h>
#include <asm/reg.h>
#include <asm/cputable.h>
@@
-407,7
+407,8
@@
struct power_pmu mpc7450_pmu = {
static int init_mpc7450_pmu(void)
{
static int init_mpc7450_pmu(void)
{
- if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
+ if (!cur_cpu_spec->oprofile_cpu_type ||
+ strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))
return -ENODEV;
return register_power_pmu(&mpc7450_pmu);
return -ENODEV;
return register_power_pmu(&mpc7450_pmu);