Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
authorIngo Molnar <mingo@kernel.org>
Tue, 24 Feb 2015 14:55:28 +0000 (15:55 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 24 Feb 2015 14:55:28 +0000 (15:55 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/mm/pgtable.c

@@@ -379,9 -308,9 +383,9 @@@ pgd_t *pgd_alloc(struct mm_struct *mm
        return pgd;
  
  out_free_pmds:
-       free_pmds(pmds);
+       free_pmds(mm, pmds);
  out_free_pgd:
 -      free_page((unsigned long)pgd);
 +      _pgd_free(pgd);
  out:
        return NULL;
  }