From 09fa8d6ae5de56df934d72b5eae5fb805e07baa0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 6 Mar 2012 18:48:13 -0800 Subject: [PATCH] --- yaml --- r: 288292 b: refs/heads/master c: 55062d061790b43aee01ab3f9ac57b8596254f19 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/hugetlbpage.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e86fc49657c5..fa6a57a5a433 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 097d59106a8e4b42d07c9892fdd7790f1659c6ff +refs/heads/master: 55062d061790b43aee01ab3f9ac57b8596254f19 diff --git a/trunk/arch/x86/mm/hugetlbpage.c b/trunk/arch/x86/mm/hugetlbpage.c index 83e7141c3982..8ecbb4bba4b3 100644 --- a/trunk/arch/x86/mm/hugetlbpage.c +++ b/trunk/arch/x86/mm/hugetlbpage.c @@ -333,7 +333,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, * Lookup failure means no vma is above this address, * i.e. return with success: */ - vma = find_vma(mm, add); + vma = find_vma(mm, addr); if (!vma) return addr;