Merge by hand (conflicts between pending drivers and kfree cleanups)

[linux-2.6-omap-h63xx.git] / arch / um / kernel / skas / mmu.c

diff --git a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
index d232daa42c314c009aa5e76141eae73217711641..677871f1b37c65d2379cd4b4b3f58e2fc9aec067 100644 (file)
--- a/arch/um/kernel/skas/mmu.c
+++ b/arch/um/kernel/skas/mmu.c
@@ -15,6 +15,7 @@
 #include "asm/mmu.h"
 #include "asm/pgalloc.h"
 #include "asm/pgtable.h"
+#include "asm/ldt.h"
 #include "os.h"
 #include "skas.h"
 
@@ -28,7 +29,6 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
        pmd_t *pmd;
        pte_t *pte;
 
-       spin_lock(&mm->page_table_lock);
        pgd = pgd_offset(mm, proc);
        pud = pud_alloc(mm, pgd, proc);
        if (!pud)
@@ -56,11 +56,13 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
         */
 
         mm->context.skas.last_page_table = pmd_page_kernel(*pmd);
+#ifdef CONFIG_3_LEVEL_PGTABLES
+        mm->context.skas.last_pmd = (unsigned long) __va(pud_val(*pud));
+#endif
 
        *pte = mk_pte(virt_to_page(kernel), __pgprot(_PAGE_PRESENT));
        *pte = pte_mkexec(*pte);
        *pte = pte_wrprotect(*pte);
-       spin_unlock(&mm->page_table_lock);
        return(0);
 
  out_pmd:
@@ -68,32 +70,21 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
  out_pte:
        pmd_free(pmd);
  out:
-       spin_unlock(&mm->page_table_lock);
        return(-ENOMEM);
 }
 
 int init_new_context_skas(struct task_struct *task, struct mm_struct *mm)
 {
-       struct mm_struct *cur_mm = current->mm;
-       struct mm_id *cur_mm_id = &cur_mm->context.skas.id;
-       struct mm_id *mm_id = &mm->context.skas.id;
-       unsigned long stack;
-       int from, ret;
+       struct mmu_context_skas *from_mm = NULL;
+       struct mmu_context_skas *to_mm = &mm->context.skas;
+       unsigned long stack = 0;
+       int from_fd, ret = -ENOMEM;
 
-       if(proc_mm){
-               if((cur_mm != NULL) && (cur_mm != &init_mm))
-                       from = cur_mm->context.skas.id.u.mm_fd;
-               else from = -1;
+       if(skas_needs_stub){
+               stack = get_zeroed_page(GFP_KERNEL);
+               if(stack == 0)
+                       goto out;
 
-               ret = new_mm(from);
-               if(ret < 0){
-                       printk("init_new_context_skas - new_mm failed, "
-                              "errno = %d\n", ret);
-                       return ret;
-               }
-               mm_id->u.mm_fd = ret;
-       }
-       else {
                /* This zeros the entry that pgd_alloc didn't, needed since
                 * we are about to reinitialize it, and want mm.nr_ptes to
                 * be accurate.
@@ -103,30 +94,51 @@ int init_new_context_skas(struct task_struct *task, struct mm_struct *mm)
                ret = init_stub_pte(mm, CONFIG_STUB_CODE,
                                    (unsigned long) &__syscall_stub_start);
                if(ret)
-                       goto out;
-
-               ret = -ENOMEM;
-               stack = get_zeroed_page(GFP_KERNEL);
-               if(stack == 0)
-                       goto out;
-               mm_id->stack = stack;
+                       goto out_free;
 
                ret = init_stub_pte(mm, CONFIG_STUB_DATA, stack);
                if(ret)
                        goto out_free;
 
                mm->nr_ptes--;
+       }
+
+       to_mm->id.stack = stack;
+       if(current->mm != NULL && current->mm != &init_mm)
+               from_mm = &current->mm->context.skas;
+
+       if(proc_mm){
+               if(from_mm)
+                       from_fd = from_mm->id.u.mm_fd;
+               else from_fd = -1;
 
-               if((cur_mm != NULL) && (cur_mm != &init_mm))
-                       mm_id->u.pid = copy_context_skas0(stack,
-                                                         cur_mm_id->u.pid);
-               else mm_id->u.pid = start_userspace(stack);
+               ret = new_mm(from_fd, stack);
+               if(ret < 0){
+                       printk("init_new_context_skas - new_mm failed, "
+                              "errno = %d\n", ret);
+                       goto out_free;
+               }
+               to_mm->id.u.mm_fd = ret;
+       }
+       else {
+               if(from_mm)
+                       to_mm->id.u.pid = copy_context_skas0(stack,
+                                                            from_mm->id.u.pid);
+               else to_mm->id.u.pid = start_userspace(stack);
+       }
+
+       ret = init_new_ldt(to_mm, from_mm);
+       if(ret < 0){
+               printk("init_new_context_skas - init_ldt"
+                      " failed, errno = %d\n", ret);
+               goto out_free;
        }
 
        return 0;
 
  out_free:
-       free_page(mm_id->stack);
+       if(to_mm->id.stack != 0)
+               free_page(to_mm->id.stack);
  out:
        return ret;
 }
@@ -137,9 +149,16 @@ void destroy_context_skas(struct mm_struct *mm)
 
        if(proc_mm)
                os_close_file(mmu->id.u.mm_fd);
-       else {
+       else
                os_kill_ptraced_process(mmu->id.u.pid, 1);
+
+       if(!proc_mm || !ptrace_faultinfo){
                free_page(mmu->id.stack);
-               free_page(mmu->last_page_table);
+               pte_lock_deinit(virt_to_page(mmu->last_page_table));
+               pte_free_kernel((pte_t *) mmu->last_page_table);
+                dec_page_state(nr_page_table_pages);
+#ifdef CONFIG_3_LEVEL_PGTABLES
+               pmd_free((pmd_t *) mmu->last_pmd);
+#endif
        }
 }