diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 22:08:52 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 22:08:52 +0200 |
commit | f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be (patch) | |
tree | fec0def5fed9ab79340a04184bc4d48ac2b832ce /arch/mips/oprofile | |
parent | generic-ipi: merge fix (diff) | |
download | linux-f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be.tar.xz linux-f6f88e9bfb6ced9871ed65ebe85c371de3c9e4be.zip |
generic-ipi: more merge fallout
fix more API change fallout in recently merged upstream changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/oprofile')
-rw-r--r-- | arch/mips/oprofile/op_model_mipsxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c index b40df7d2cf44..54759f1669d3 100644 --- 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 - 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()) { @@ -382,7 +382,7 @@ static void mipsxx_exit(void) 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; } |