diff options
author | Thiemo Seufer <ths@networkno.de> | 2008-05-06 06:23:33 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-05-12 11:46:56 -0400 |
commit | 005ca9a3f1238ffebd9c4d09d581f708277d2985 (patch) | |
tree | b82a4682a6e47717c5c57b81258ae2c63a3ad433 /arch | |
parent | 83738e307365aa2de4a1be65ed574aaebce52ea0 (diff) |
[MIPS] Fix build failure in mips oprofile code
This patch fixes a warning-as-error induced build failure of 64bit MIPS
kernels.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/oprofile/op_model_mipsxx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c index da8cbb6899dc..b40df7d2cf44 100644 --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c | |||
@@ -281,7 +281,7 @@ static inline int n_counters(void) | |||
281 | 281 | ||
282 | static void reset_counters(void *arg) | 282 | static void reset_counters(void *arg) |
283 | { | 283 | { |
284 | int counters = (int)arg; | 284 | int counters = (int)(long)arg; |
285 | switch (counters) { | 285 | switch (counters) { |
286 | case 4: | 286 | case 4: |
287 | w_c0_perfctrl3(0); | 287 | w_c0_perfctrl3(0); |
@@ -313,7 +313,7 @@ static int __init mipsxx_init(void) | |||
313 | if (!cpu_has_mipsmt_pertccounters) | 313 | if (!cpu_has_mipsmt_pertccounters) |
314 | counters = counters_total_to_per_cpu(counters); | 314 | counters = counters_total_to_per_cpu(counters); |
315 | #endif | 315 | #endif |
316 | on_each_cpu(reset_counters, (void *)counters, 0, 1); | 316 | on_each_cpu(reset_counters, (void *)(long)counters, 0, 1); |
317 | 317 | ||
318 | op_model_mipsxx_ops.num_counters = counters; | 318 | op_model_mipsxx_ops.num_counters = counters; |
319 | switch (current_cpu_type()) { | 319 | switch (current_cpu_type()) { |
@@ -382,7 +382,7 @@ static void mipsxx_exit(void) | |||
382 | int counters = op_model_mipsxx_ops.num_counters; | 382 | int counters = op_model_mipsxx_ops.num_counters; |
383 | 383 | ||
384 | counters = counters_per_cpu_to_total(counters); | 384 | counters = counters_per_cpu_to_total(counters); |
385 | on_each_cpu(reset_counters, (void *)counters, 0, 1); | 385 | on_each_cpu(reset_counters, (void *)(long)counters, 0, 1); |
386 | 386 | ||
387 | perf_irq = save_perf_irq; | 387 | perf_irq = save_perf_irq; |
388 | } | 388 | } |