Commit 8af2ce7e authored by David Mosberger's avatar David Mosberger

ia64: Sync with 2.5.30.

parent b26fe855
...@@ -616,7 +616,7 @@ pfm_remove_smpl_mapping(struct task_struct *task) ...@@ -616,7 +616,7 @@ pfm_remove_smpl_mapping(struct task_struct *task)
down_write(&task->mm->mmap_sem); down_write(&task->mm->mmap_sem);
r = do_munmap(task->mm, ctx->ctx_smpl_vaddr, psb->psb_size, 0); r = do_munmap(task->mm, ctx->ctx_smpl_vaddr, psb->psb_size);
up_write(&task->mm->mmap_sem); up_write(&task->mm->mmap_sem);
if (r !=0) { if (r !=0) {
......
...@@ -119,7 +119,7 @@ ia64_brk (unsigned long brk, long arg1, long arg2, long arg3, ...@@ -119,7 +119,7 @@ ia64_brk (unsigned long brk, long arg1, long arg2, long arg3,
/* Always allow shrinking brk. */ /* Always allow shrinking brk. */
if (brk <= mm->brk) { if (brk <= mm->brk) {
if (!do_munmap(mm, newbrk, oldbrk-newbrk, 1)) if (!do_munmap(mm, newbrk, oldbrk-newbrk))
goto set_brk; goto set_brk;
goto out; goto out;
} }
......
...@@ -164,7 +164,7 @@ free_initrd_mem (unsigned long start, unsigned long end) ...@@ -164,7 +164,7 @@ free_initrd_mem (unsigned long start, unsigned long end)
page = virt_to_page(start); page = virt_to_page(start);
ClearPageReserved(page); ClearPageReserved(page);
set_page_count(page, 1); set_page_count(page, 1);
free_page(page); free_page(start);
++totalram_pages; ++totalram_pages;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment