diff --git a/[refs] b/[refs]
index d238a2f34255..5cca752ae890 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74c383f1400f559562aa517d6d62f77245bddf52
+refs/heads/master: 90aef12e6dd609e1ad7fb70044eedc78ca55ee5e
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index d3a6ec2c9627..5f577a63bdf0 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -586,7 +586,7 @@ static void use_mm(struct mm_struct *mm)
 	 * Note that on UML this *requires* PF_BORROWED_MM to be set, otherwise
 	 * it won't work. Update it accordingly if you change it here
 	 */
-	activate_mm(active_mm, mm);
+	switch_mm(active_mm, mm, tsk);
 	task_unlock(tsk);
 
 	mmdrop(active_mm);