diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /mm/memory.c | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index f0baed69f..e5a548925 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -48,9 +48,9 @@ #include <linux/pagemap.h> -unsigned long max_mapnr = 0; -unsigned long num_physpages = 0; -void * high_memory = NULL; +unsigned long max_mapnr; +unsigned long num_physpages; +void * high_memory; struct page *highmem_start_page; /* @@ -861,7 +861,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct * vma, * Ok, we need to copy. Oh, well.. */ spin_unlock(&mm->page_table_lock); - new_page = alloc_page(GFP_HIGHUSER); + new_page = page_cache_alloc(); if (!new_page) return -1; spin_lock(&mm->page_table_lock); |