summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-09-21 17:04:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-22 07:17:45 -0700
commit4d04c70754eec6d0fd342a5bc3f684db69cc2226 (patch)
tree4001855784fddcec748e2f9754933a537d04c7d4 /arch/um
parentdb4e5cbe2f201c6abd51f7dfe41dbd2589affeba (diff)
downloadlinux-3.10-4d04c70754eec6d0fd342a5bc3f684db69cc2226.tar.gz
linux-3.10-4d04c70754eec6d0fd342a5bc3f684db69cc2226.tar.bz2
linux-3.10-4d04c70754eec6d0fd342a5bc3f684db69cc2226.zip
uml: fix order of pud and pmd_free()
If pmd_alloc() fails we should only free the prior allocated pud, if pte_alloc_map() fails, we should free pmd as well. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/skas/mmu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index 0cd9a7a05e7..8bfd1e90581 100644
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -38,10 +38,10 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
*pte = pte_mkread(*pte);
return 0;
- out_pmd:
- pud_free(mm, pud);
out_pte:
pmd_free(mm, pmd);
+ out_pmd:
+ pud_free(mm, pud);
out:
return -ENOMEM;
}