diff --git a/[refs] b/[refs]
index c73b43bb48a2..09359c5e8048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55b8cab49dd43d227f0dd49e3524406fdc46d37b
+refs/heads/master: fa40699b975131028a61aa8e095b0b17f350da40
diff --git a/trunk/arch/um/include/asm/mmu_context.h b/trunk/arch/um/include/asm/mmu_context.h
index 54f42e8b0105..34d813011b7a 100644
--- a/trunk/arch/um/include/asm/mmu_context.h
+++ b/trunk/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);
 	}