Messages in this thread | | | Date | Mon, 24 Sep 2012 23:12:29 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the vfs tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in arch/ia64/kernel/perfmon.c between commit f9bd4f3ed24d ("make get_file() return its argument") from the vfs tree and commit "mm: kill vma flag VM_RESERVED and mm->reserved_vm counter" from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/ia64/kernel/perfmon.c index f388b4e,2eae90e..0000000 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c @@@ -2306,8 -2306,8 +2306,8 @@@ pfm_smpl_buffer_alloc(struct task_struc * partially initialize the vma for the sampling buffer */ vma->vm_mm = mm; - vma->vm_file = filp; + vma->vm_file = get_file(filp); - vma->vm_flags = VM_READ| VM_MAYREAD |VM_RESERVED; + vma->vm_flags = VM_READ | VM_MAYREAD | VM_DONTEXPAND | VM_DONTDUMP; vma->vm_page_prot = PAGE_READONLY; /* XXX may need to change */ /* [unhandled content-type:application/pgp-signature] | |