---

yaml --- r: 57851 b: refs/heads/master c: 2274192 h: refs/heads/master i: 57849: e1516bd 57847: dff84d6 v: v3
git-mirror · Jun 16, 2007 · 4a845bd · 4a845bd
1 parent 18aabf1
commit 4a845bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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