Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 2 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index c47e87278a92..cc63fae02f06 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -271,9 +271,10 @@ static struct mempolicy *shm_get_policy(struct vm_area_struct *vma,
 
         if (sfd->vm_ops->get_policy)
                 pol = sfd->vm_ops->get_policy(vma, addr);
-        else if (vma->vm_policy)
+        else if (vma->vm_policy) {
                 pol = vma->vm_policy;
-        else
+                mpol_get(pol);  /* get_vma_policy() expects this */
+        } else
                 pol = current->mempolicy;
         return pol;
 }