Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history
…linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] SMP: Fix use of cpumasks.
  [MIPS] Revert "[MIPS] tlbex.c: Cleanup __init usage."
  [MIPS] CFE: Add missing parenthesis.
  • Loading branch information
Linus Torvalds committed Oct 13, 2007
2 parents bcd11ea + ece8a9e commit ffb0355
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 52 deletions.
6 changes: 3 additions & 3 deletions arch/mips/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ void flush_tlb_mm(struct mm_struct *mm)
unsigned int cpu;

cpu_clear(smp_processor_id(), mask);
for_each_online_cpu(cpu)
for_each_cpu_mask(cpu, mask)
if (cpu_context(cpu, mm))
cpu_context(cpu, mm) = 0;
}
Expand Down Expand Up @@ -419,7 +419,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
unsigned int cpu;

cpu_clear(smp_processor_id(), mask);
for_each_online_cpu(cpu)
for_each_cpu_mask(cpu, mask)
if (cpu_context(cpu, mm))
cpu_context(cpu, mm) = 0;
}
Expand Down Expand Up @@ -466,7 +466,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
unsigned int cpu;

cpu_clear(smp_processor_id(), mask);
for_each_online_cpu(cpu)
for_each_cpu_mask(cpu, mask)
if (cpu_context(cpu, vma->vm_mm))
cpu_context(cpu, vma->vm_mm) = 0;
}
Expand Down
Loading

0 comments on commit ffb0355

Please sign in to comment.