Messages in this thread Patch in this message | | | Date | Mon, 12 Nov 2012 11:00:05 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the final tree (akpm tree related) |
| |
Hi Andrew,
On Thu, 8 Nov 2012 20:01:54 -0800 Andrew Morton <akpm@linux-foundation.org> wrote: > > oop, I fixed that but forgot to commit the changes, sorry. > > s/mm/current->mm/
I have applied this to the akpm tree today:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 12 Nov 2012 10:51:18 +1100 Subject: [PATCH] mm: fix for use vm_unmapped_area() in hugetlbfs on i386 architecture
Fix-from: Adnrew Morton <akpm@linux-foundation.org> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/x86/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c index c00c4a4..ae1aa71 100644 --- a/arch/x86/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c @@ -296,7 +296,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, info.flags = VM_UNMAPPED_AREA_TOPDOWN; info.length = len; info.low_limit = PAGE_SIZE; - info.high_limit = mm->mmap_base; + info.high_limit = current->mm->mmap_base; info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; addr = vm_unmapped_area(&info); -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |