git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
mips
/
oprofile
/
common.c
diff --git
a/arch/mips/oprofile/common.c
b/arch/mips/oprofile/common.c
index
65eb554
..
aa52aa1
100644
(file)
--- a/
arch/mips/oprofile/common.c
+++ b/
arch/mips/oprofile/common.c
@@
-74,7
+74,7
@@
int __init oprofile_arch_init(struct oprofile_operations *ops)
struct op_mips_model *lmodel = NULL;
int res;
struct op_mips_model *lmodel = NULL;
int res;
- switch (current_cpu_
data.cputype
) {
+ switch (current_cpu_
type()
) {
case CPU_5KC:
case CPU_20KC:
case CPU_24K:
case CPU_5KC:
case CPU_20KC:
case CPU_24K:
@@
-83,6
+83,9
@@
int __init oprofile_arch_init(struct oprofile_operations *ops)
case CPU_74K:
case CPU_SB1:
case CPU_SB1A:
case CPU_74K:
case CPU_SB1:
case CPU_SB1A:
+ case CPU_R10000:
+ case CPU_R12000:
+ case CPU_R14000:
lmodel = &op_model_mipsxx_ops;
break;
lmodel = &op_model_mipsxx_ops;
break;