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 branch 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
oprofile
/
op_model_mipsxx.c
diff --git
a/arch/mips/oprofile/op_model_mipsxx.c
b/arch/mips/oprofile/op_model_mipsxx.c
index
b40df7d
..
54759f1
100644
(file)
--- a/
arch/mips/oprofile/op_model_mipsxx.c
+++ b/
arch/mips/oprofile/op_model_mipsxx.c
@@
-313,7
+313,7
@@
static int __init mipsxx_init(void)
if (!cpu_has_mipsmt_pertccounters)
counters = counters_total_to_per_cpu(counters);
#endif
if (!cpu_has_mipsmt_pertccounters)
counters = counters_total_to_per_cpu(counters);
#endif
- on_each_cpu(reset_counters, (void *)(long)counters,
0,
1);
+ on_each_cpu(reset_counters, (void *)(long)counters, 1);
op_model_mipsxx_ops.num_counters = counters;
switch (current_cpu_type()) {
op_model_mipsxx_ops.num_counters = counters;
switch (current_cpu_type()) {
@@
-382,7
+382,7
@@
static void mipsxx_exit(void)
int counters = op_model_mipsxx_ops.num_counters;
counters = counters_per_cpu_to_total(counters);
int counters = op_model_mipsxx_ops.num_counters;
counters = counters_per_cpu_to_total(counters);
- on_each_cpu(reset_counters, (void *)(long)counters,
0,
1);
+ on_each_cpu(reset_counters, (void *)(long)counters, 1);
perf_irq = save_perf_irq;
}
perf_irq = save_perf_irq;
}