Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus

[karo-tx-linux.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 0843feb66f3d0236abd4386b5bfd0170c24ae0ef..91b13d6a16d453b50894e6028800b92399bf8f14 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -25,6 +25,7 @@
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
+#include <asm/pgalloc.h>
 
 #include "internal.h"
 
@@ -62,8 +63,10 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
                return NULL;
 
        pmd = pmd_alloc(mm, pud, addr);
-       if (!pmd)
+       if (!pmd) {
+               pud_free(mm, pud);
                return NULL;
+       }
 
        VM_BUG_ON(pmd_trans_huge(*pmd));