diff --git a/[refs] b/[refs]
index 265012df2d90..0f82f110cc1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74584ae509befc2ed711810e7df4b075473869b2
+refs/heads/master: 22741925d268e8479ef66312749bd8d96ed35365
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 02faa54dbf5a..047b823e6bf0 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -254,8 +254,10 @@ struct mempolicy *shm_get_policy(struct vm_area_struct *vma, unsigned long addr)
 
 	if (sfd->vm_ops->get_policy)
 		pol = sfd->vm_ops->get_policy(vma, addr);
-	else
+	else if (vma->vm_policy)
 		pol = vma->vm_policy;
+	else
+		pol = current->mempolicy;
 	return pol;
 }
 #endif