From: Jack Steiner <steiner@sgi.com>
Date: Tue, 9 Dec 2008 16:51:32 +0000 (-0600)
Subject: [IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
X-Git-Tag: v2.6.28-rc8~12^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=023a407f1cdc8b86903495d7ce0d2abae0f8bce5;p=linux-2.6-omap-h63xx.git

[IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE

Eliminate compile error when compiling without CONFIG_HUGETLB_PAGE.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c
index 8c389d606c3..3ee698ad859 100644
--- a/drivers/misc/sgi-gru/grufault.c
+++ b/drivers/misc/sgi-gru/grufault.c
@@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
 		return 1;
 
 	*paddr = pte_pfn(pte) << PAGE_SHIFT;
+#ifdef CONFIG_HUGETLB_PAGE
 	*pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT;
+#else
+	*pageshift = PAGE_SHIFT;
+#endif
 	return 0;
 
 err: