Merge branches 'acpi-scan', 'acpi-pnp' and 'acpi-sleep'

[linux-2.6-microblaze.git] / mm / mempolicy.c

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 3ca4898..8cf96bd 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1114,9 +1114,7 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
        int err;
        nodemask_t tmp;
 
-       err = migrate_prep();
-       if (err)
-               return err;
+       migrate_prep();
 
        mmap_read_lock(mm);
 
@@ -1315,9 +1313,7 @@ static long do_mbind(unsigned long start, unsigned long len,
 
        if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) {
 
-               err = migrate_prep();
-               if (err)
-                       goto mpol_out;
+               migrate_prep();
        }
        {
                NODEMASK_SCRATCH(scratch);