aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2009-04-02 10:02:42 -0400
committerJesper Nilsson <jesper.nilsson@axis.com>2009-04-02 10:02:42 -0400
commit276e79ee6b3ff670dc9c041178da4b61af456a27 (patch)
treea6ac263bb1a5ae942bd78c70eee1cd9cef53dd80 /arch/cris
parent3b5a53689730bef6cb4dfde1de53e836e5299547 (diff)
parentb9d65c04773850ff3a82f69d43981be650e658a1 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-cris into for-next
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/kernel/smp.c10
-rw-r--r--arch/cris/arch-v32/mm/tlb.c2
-rw-r--r--arch/cris/kernel/setup.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index f59a973c97ee..d2a3ff8c4d37 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -97,9 +97,9 @@ void __devinit smp_prepare_boot_cpu(void)
97 SUPP_BANK_SEL(2); 97 SUPP_BANK_SEL(2);
98 SUPP_REG_WR(RW_MM_TLB_PGD, pgd); 98 SUPP_REG_WR(RW_MM_TLB_PGD, pgd);
99 99
100 cpu_set(0, cpu_online_map); 100 set_cpu_online(0, true);
101 cpu_set(0, phys_cpu_present_map); 101 cpu_set(0, phys_cpu_present_map);
102 cpu_set(0, cpu_possible_map); 102 set_cpu_possible(0, true);
103} 103}
104 104
105void __init smp_cpus_done(unsigned int max_cpus) 105void __init smp_cpus_done(unsigned int max_cpus)
@@ -231,7 +231,7 @@ void flush_tlb_common(struct mm_struct* mm, struct vm_area_struct* vma, unsigned
231 cpumask_t cpu_mask; 231 cpumask_t cpu_mask;
232 232
233 spin_lock_irqsave(&tlbstate_lock, flags); 233 spin_lock_irqsave(&tlbstate_lock, flags);
234 cpu_mask = (mm == FLUSH_ALL ? CPU_MASK_ALL : mm->cpu_vm_mask); 234 cpu_mask = (mm == FLUSH_ALL ? cpu_all_mask : *mm_cpumask(mm));
235 cpu_clear(smp_processor_id(), cpu_mask); 235 cpu_clear(smp_processor_id(), cpu_mask);
236 flush_mm = mm; 236 flush_mm = mm;
237 flush_vma = vma; 237 flush_vma = vma;
@@ -251,8 +251,8 @@ void flush_tlb_mm(struct mm_struct *mm)
251 __flush_tlb_mm(mm); 251 __flush_tlb_mm(mm);
252 flush_tlb_common(mm, FLUSH_ALL, 0); 252 flush_tlb_common(mm, FLUSH_ALL, 0);
253 /* No more mappings in other CPUs */ 253 /* No more mappings in other CPUs */
254 cpus_clear(mm->cpu_vm_mask); 254 cpumask_clear(mm_cpumask(mm));
255 cpu_set(smp_processor_id(), mm->cpu_vm_mask); 255 cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
256} 256}
257 257
258void flush_tlb_page(struct vm_area_struct *vma, 258void flush_tlb_page(struct vm_area_struct *vma,
diff --git a/arch/cris/arch-v32/mm/tlb.c b/arch/cris/arch-v32/mm/tlb.c
index 55ade36fe8a8..6779bcb28ab0 100644
--- a/arch/cris/arch-v32/mm/tlb.c
+++ b/arch/cris/arch-v32/mm/tlb.c
@@ -185,7 +185,7 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
185 /* Make sure there is a MMU context. */ 185 /* Make sure there is a MMU context. */
186 spin_lock(&mmu_context_lock); 186 spin_lock(&mmu_context_lock);
187 get_mmu_context(next); 187 get_mmu_context(next);
188 cpu_set(cpu, next->cpu_vm_mask); 188 cpumask_set_cpu(cpu, mm_cpumask(next));
189 spin_unlock(&mmu_context_lock); 189 spin_unlock(&mmu_context_lock);
190 190
191 /* 191 /*
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 04d48dd91ddf..b712f4934c4b 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -166,7 +166,7 @@ void __init setup_arch(char **cmdline_p)
166 166
167static void *c_start(struct seq_file *m, loff_t *pos) 167static void *c_start(struct seq_file *m, loff_t *pos)
168{ 168{
169 return *pos < NR_CPUS ? (void *)(int)(*pos + 1): NULL; 169 return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;
170} 170}
171 171
172static void *c_next(struct seq_file *m, void *v, loff_t *pos) 172static void *c_next(struct seq_file *m, void *v, loff_t *pos)