tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Jack Steiner and committed by Tony Luck 023a407f 6afc9be1

+4
unified split
+4
drivers/misc/sgi-gru/grufault.c
··· 254 return 1; 255 256 *paddr = pte_pfn(pte) << PAGE_SHIFT; 257 *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; 258 return 0; 259 260 err:
··· 254 return 1; 255 256 *paddr = pte_pfn(pte) << PAGE_SHIFT; 257 + #ifdef CONFIG_HUGETLB_PAGE 258 *pageshift = is_vm_hugetlb_page(vma) ? HPAGE_SHIFT : PAGE_SHIFT; 259 + #else 260 + *pageshift = PAGE_SHIFT; 261 + #endif 262 return 0; 263 264 err: