Merge branch 'hid-suspend' into picolcd

[pandora-kernel.git] / arch / um / kernel / skas / mmu.c

diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index 78b3e9f..3d099f9 100644 (file)
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -5,6 +5,7 @@
 
 #include "linux/mm.h"
 #include "linux/sched.h"
+#include "linux/slab.h"
 #include "asm/pgalloc.h"
 #include "asm/pgtable.h"
 #include "as-layout.h"
@@ -38,10 +39,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;
 }
@@ -91,6 +92,8 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm)
                goto out_free;
        }
 
+       to_mm->stub_pages = NULL;
+
        return 0;
 
  out_free:
@@ -126,6 +129,7 @@ void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
 
        pages[0] = virt_to_page(&__syscall_stub_start);
        pages[1] = virt_to_page(mm->context.id.stack);
+       mm->context.stub_pages = pages;
 
        /* dup_mmap already holds mmap_sem */
        err = install_special_mapping(mm, STUB_START, STUB_END - STUB_START,
@@ -147,6 +151,8 @@ void arch_exit_mmap(struct mm_struct *mm)
 {
        pte_t *pte;
 
+       if (mm->context.stub_pages != NULL)
+               kfree(mm->context.stub_pages);
        pte = virt_to_pte(mm, STUB_CODE);
        if (pte != NULL)
                pte_clear(mm, STUB_CODE, pte);