vserver 2.0 rc7

[linux-2.6.git] / arch / sparc64 / kernel / module.c

diff --git a/arch/sparc64/kernel/module.c b/arch/sparc64/kernel/module.c
index a4ae2e3..6c83e37 100644 (file)
--- a/arch/sparc64/kernel/module.c
+++ b/arch/sparc64/kernel/module.c
@@ -17,108 +17,19 @@
 #include <asm/processor.h>
 #include <asm/spitfire.h>
 
-static struct vm_struct * modvmlist = NULL;
-
-static void module_unmap(void * addr)
-{
-       struct vm_struct **p, *tmp;
-       int i;
-
-       if (!addr)
-               return;
-       if ((PAGE_SIZE-1) & (unsigned long) addr) {
-               printk("Trying to unmap module with bad address (%p)\n", addr);
-               return;
-       }
-
-       for (p = &modvmlist; (tmp = *p) != NULL; p = &tmp->next) {
-               if (tmp->addr == addr) {
-                       *p = tmp->next;
-                       goto found;
-               }
-       }
-       printk("Trying to unmap nonexistent module vm area (%p)\n", addr);
-       return;
-
-found:
-       unmap_vm_area(tmp);
-       
-       for (i = 0; i < tmp->nr_pages; i++) {
-               if (unlikely(!tmp->pages[i]))
-                       BUG();
-               __free_page(tmp->pages[i]);
-       }
-
-       kfree(tmp->pages);
-       kfree(tmp);
-}
-
-
 static void *module_map(unsigned long size)
 {
-       struct vm_struct **p, *tmp, *area;
-       struct page **pages;
-       void * addr;
-       unsigned int nr_pages, array_size, i;
+       struct vm_struct *area;
 
        size = PAGE_ALIGN(size);
        if (!size || size > MODULES_LEN)
                return NULL;
-               
-       addr = (void *) MODULES_VADDR;
-       for (p = &modvmlist; (tmp = *p) != NULL; p = &tmp->next) {
-               if (size + (unsigned long) addr < (unsigned long) tmp->addr)
-                       break;
-               addr = (void *) (tmp->size + (unsigned long) tmp->addr);
-       }
-       if ((unsigned long) addr + size >= MODULES_END)
-               return NULL;
-       
-       area = (struct vm_struct *) kmalloc(sizeof(*area), GFP_KERNEL);
+
+       area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);
        if (!area)
                return NULL;
-       area->size = size + PAGE_SIZE;
-       area->addr = addr;
-       area->next = *p;
-       area->pages = NULL;
-       area->nr_pages = 0;
-       area->phys_addr = 0;
-       *p = area;
-
-       nr_pages = size >> PAGE_SHIFT;
-       array_size = (nr_pages * sizeof(struct page *));
-
-       area->nr_pages = nr_pages;
-       area->pages = pages = kmalloc(array_size, GFP_KERNEL);
-       if (!area->pages)
-               goto fail;
-
-       memset(area->pages, 0, array_size);
-
-       for (i = 0; i < area->nr_pages; i++) {
-               area->pages[i] = alloc_page(GFP_KERNEL);
-               if (unlikely(!area->pages[i]))
-                       goto fail;
-       }
-       
-       if (map_vm_area(area, PAGE_KERNEL, &pages)) {
-               unmap_vm_area(area);
-               goto fail;
-       }
-
-       return area->addr;
-
-fail:
-       if (area->pages) {
-               for (i = 0; i < area->nr_pages; i++) {
-                       if (area->pages[i])
-                               __free_page(area->pages[i]);
-               }
-               kfree(area->pages);
-       }
-       kfree(area);
 
-       return NULL;
+       return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
 }
 
 void *module_alloc(unsigned long size)
@@ -141,9 +52,7 @@ void *module_alloc(unsigned long size)
 /* Free memory returned from module_core_alloc/module_init_alloc */
 void module_free(struct module *mod, void *module_region)
 {
-       write_lock(&vmlist_lock);
-       module_unmap(module_region);
-       write_unlock(&vmlist_lock);
+       vfree(module_region);
        /* FIXME: If module_region == mod->init_region, trim exception
            table entries. */
 }