aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2008-12-09 10:51:32 -0600
committerTony Luck <tony.luck@intel.com>2008-12-09 10:06:43 -0800
commit023a407f1cdc8b86903495d7ce0d2abae0f8bce5 (patch)
tree37aba8187d317f27dd0202d3a3fcf737bcc9c3b9
parent6afc9be1de0b938169d8985a3add0e3727ebc717 (diff)
downloadlinux-2.6.34-ux500-023a407f1cdc8b86903495d7ce0d2abae0f8bce5.tar.gz
[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>
-rw-r--r--drivers/misc/sgi-gru/grufault.c4
1 files changed, 4 insertions, 0 deletions
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: