Pull cpuidle into release branch

[pandora-kernel.git] / arch / mips / kernel / smp.c

diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 54464fd..63989e9 100644 (file)
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -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;
        }
@@ -407,18 +407,19 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
 
        preempt_disable();
        if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
-               struct flush_tlb_data fd;
+               struct flush_tlb_data fd = {
+                       .vma = vma,
+                       .addr1 = start,
+                       .addr2 = end,
+               };
 
-               fd.vma = vma;
-               fd.addr1 = start;
-               fd.addr2 = end;
                smp_on_other_tlbs(flush_tlb_range_ipi, &fd);
        } else {
                cpumask_t mask = cpu_online_map;
                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;
        }
@@ -435,10 +436,11 @@ static void flush_tlb_kernel_range_ipi(void *info)
 
 void flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
-       struct flush_tlb_data fd;
+       struct flush_tlb_data fd = {
+               .addr1 = start,
+               .addr2 = end,
+       };
 
-       fd.addr1 = start;
-       fd.addr2 = end;
        on_each_cpu(flush_tlb_kernel_range_ipi, &fd, 1, 1);
 }
 
@@ -453,17 +455,18 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 {
        preempt_disable();
        if ((atomic_read(&vma->vm_mm->mm_users) != 1) || (current->mm != vma->vm_mm)) {
-               struct flush_tlb_data fd;
+               struct flush_tlb_data fd = {
+                       .vma = vma,
+                       .addr1 = page,
+               };
 
-               fd.vma = vma;
-               fd.addr1 = page;
                smp_on_other_tlbs(flush_tlb_page_ipi, &fd);
        } else {
                cpumask_t mask = cpu_online_map;
                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;
        }