summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-07-29 03:09:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-07-29 03:09:29 +0000
commitecfe89622d91d2325a2904c0582e29b57711f45b (patch)
treed69e7c577fa10baaaa16d35b3b1b3970043278e6 /mm
parent32b3fe8f5662c26a6097927047c5ce493be88615 (diff)
Cleanup ...
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c3
-rw-r--r--mm/slab.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 81022e770..3e94fd1f3 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -810,9 +810,10 @@ static void do_no_page(struct task_struct * tsk, struct vm_area_struct * vma,
anonymous_page:
entry = pte_wrprotect(mk_pte(ZERO_PAGE, vma->vm_page_prot));
if (write_access) {
- unsigned long page = get_free_page(GFP_KERNEL);
+ unsigned long page = __get_free_page(GFP_KERNEL);
if (!page)
goto sigbus;
+ clear_page(page);
entry = pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
vma->vm_mm->rss++;
tsk->min_flt++;
diff --git a/mm/slab.c b/mm/slab.c
index f4793d271..fa89b9e20 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1649,7 +1649,6 @@ kfree(const void *objp)
}
null_ptr:
printk(KERN_ERR "kfree: Bad obj %p\n", objp);
-while(1);
return;
}