aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-10-29 14:08:25 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-10-29 14:08:25 -0400
commit48a26e60c6a5adb0d2f3ba56ea7c5bbb58d2118e (patch)
tree627c04e1a90ff6330c9c1e47164193eb9c2b3170 /arch/mips
parentc8c5f3fd9f0518cef58c9114513eee61855dec44 (diff)
MIPS: Remove wait argument of r4k_on_each_cpu
All callers were passing in 1 anyway. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/mm/c-r4k.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 4a46fb6508fe..b4923a75cb4b 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -44,13 +44,12 @@
44 * primary cache. 44 * primary cache.
45 * o doesn't disable interrupts on the local CPU 45 * o doesn't disable interrupts on the local CPU
46 */ 46 */
47static inline void r4k_on_each_cpu(void (*func) (void *info), void *info, 47static inline void r4k_on_each_cpu(void (*func) (void *info), void *info)
48 int wait)
49{ 48{
50 preempt_disable(); 49 preempt_disable();
51 50
52#if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC) 51#if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC)
53 smp_call_function(func, info, wait); 52 smp_call_function(func, info, 1);
54#endif 53#endif
55 func(info); 54 func(info);
56 preempt_enable(); 55 preempt_enable();
@@ -364,7 +363,7 @@ static inline void local_r4k___flush_cache_all(void * args)
364 363
365static void r4k___flush_cache_all(void) 364static void r4k___flush_cache_all(void)
366{ 365{
367 r4k_on_each_cpu(local_r4k___flush_cache_all, NULL, 1); 366 r4k_on_each_cpu(local_r4k___flush_cache_all, NULL);
368} 367}
369 368
370static inline int has_valid_asid(const struct mm_struct *mm) 369static inline int has_valid_asid(const struct mm_struct *mm)
@@ -411,7 +410,7 @@ static void r4k_flush_cache_range(struct vm_area_struct *vma,
411 int exec = vma->vm_flags & VM_EXEC; 410 int exec = vma->vm_flags & VM_EXEC;
412 411
413 if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) 412 if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc))
414 r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1); 413 r4k_on_each_cpu(local_r4k_flush_cache_range, vma);
415} 414}
416 415
417static inline void local_r4k_flush_cache_mm(void * args) 416static inline void local_r4k_flush_cache_mm(void * args)
@@ -443,7 +442,7 @@ static void r4k_flush_cache_mm(struct mm_struct *mm)
443 if (!cpu_has_dc_aliases) 442 if (!cpu_has_dc_aliases)
444 return; 443 return;
445 444
446 r4k_on_each_cpu(local_r4k_flush_cache_mm, mm, 1); 445 r4k_on_each_cpu(local_r4k_flush_cache_mm, mm);
447} 446}
448 447
449struct flush_cache_page_args { 448struct flush_cache_page_args {
@@ -535,7 +534,7 @@ static void r4k_flush_cache_page(struct vm_area_struct *vma,
535 args.addr = addr; 534 args.addr = addr;
536 args.pfn = pfn; 535 args.pfn = pfn;
537 536
538 r4k_on_each_cpu(local_r4k_flush_cache_page, &args, 1); 537 r4k_on_each_cpu(local_r4k_flush_cache_page, &args);
539} 538}
540 539
541static inline void local_r4k_flush_data_cache_page(void * addr) 540static inline void local_r4k_flush_data_cache_page(void * addr)
@@ -548,8 +547,7 @@ static void r4k_flush_data_cache_page(unsigned long addr)
548 if (in_atomic()) 547 if (in_atomic())
549 local_r4k_flush_data_cache_page((void *)addr); 548 local_r4k_flush_data_cache_page((void *)addr);
550 else 549 else
551 r4k_on_each_cpu(local_r4k_flush_data_cache_page, (void *) addr, 550 r4k_on_each_cpu(local_r4k_flush_data_cache_page, (void *) addr);
552 1);
553} 551}
554 552
555struct flush_icache_range_args { 553struct flush_icache_range_args {
@@ -590,7 +588,7 @@ static void r4k_flush_icache_range(unsigned long start, unsigned long end)
590 args.start = start; 588 args.start = start;
591 args.end = end; 589 args.end = end;
592 590
593 r4k_on_each_cpu(local_r4k_flush_icache_range_ipi, &args, 1); 591 r4k_on_each_cpu(local_r4k_flush_icache_range_ipi, &args);
594 instruction_hazard(); 592 instruction_hazard();
595} 593}
596 594
@@ -711,7 +709,7 @@ static void local_r4k_flush_cache_sigtramp(void * arg)
711 709
712static void r4k_flush_cache_sigtramp(unsigned long addr) 710static void r4k_flush_cache_sigtramp(unsigned long addr)
713{ 711{
714 r4k_on_each_cpu(local_r4k_flush_cache_sigtramp, (void *) addr, 1); 712 r4k_on_each_cpu(local_r4k_flush_cache_sigtramp, (void *) addr);
715} 713}
716 714
717static void r4k_flush_icache_all(void) 715static void r4k_flush_icache_all(void)