2 files changed, 3 insertions, 3 deletions

diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
index 54f42e8b0105..34d813011b7a 100644
--- a/arch/um/include/asm/mmu_context.h
+++ b/arch/um/include/asm/mmu_context.h
@@ -35,8 +35,8 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
         unsigned cpu = smp_processor_id();
 
         if(prev != next){
-                cpu_clear(cpu, prev->cpu_vm_mask);
-                cpu_set(cpu, next->cpu_vm_mask);
+                cpumask_clear_cpu(cpu, mm_cpumask(prev));
+                cpumask_set_cpu(cpu, mm_cpumask(next));
                 if(next != &init_mm)
                         __switch_mm(&next->context.id);
         }
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index 98351c78bc81..106bf27e2a9a 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -111,7 +111,7 @@ void smp_prepare_cpus(unsigned int maxcpus)
         int i;
 
         for (i = 0; i < ncpus; ++i)
-                cpu_set(i, cpu_possible_map);
+                set_cpu_possible(i, true);
 
         cpu_clear(me, cpu_online_map);
         cpu_set(me, cpu_online_map);