diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /mm/vmalloc.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index e7711c23c..e99ad35fb 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -5,11 +5,9 @@ */ #include <linux/malloc.h> -#include <linux/swapctl.h> #include <linux/vmalloc.h> #include <asm/uaccess.h> -#include <asm/system.h> static struct vm_struct * vmlist = NULL; @@ -38,8 +36,7 @@ static inline void free_area_pte(pmd_t * pmd, unsigned long address, unsigned lo if (pte_none(page)) continue; if (pte_present(page)) { - free_user_page(mem_map + MAP_NR(pte_page(page)), - pte_page(page)); + free_page(pte_page(page)); continue; } printk("Whee.. Swapped out page in kernel page table\n"); @@ -97,7 +94,7 @@ static inline int alloc_area_pte(pte_t * pte, unsigned long address, unsigned lo unsigned long page; if (!pte_none(*pte)) printk("alloc_area_pte: page already exists\n"); - page = get_user_page(address); + page = __get_free_page(GFP_KERNEL); if (!page) return -ENOMEM; set_pte(pte, mk_pte(page, prot)); |