]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
authorJack Steiner <steiner@sgi.com>
Tue, 9 Dec 2008 16:51:32 +0000 (10:51 -0600)
committerTony Luck <tony.luck@intel.com>
Tue, 9 Dec 2008 18:06:43 +0000 (10:06 -0800)
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>
drivers/misc/sgi-gru/grufault.c

index 8c389d606c304c8b9b34022c8d2e71ceba4bb6e8..3ee698ad85997cf2f5c32b986689d7c07a0ed607 100644 (file)
@@ -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: