projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
[cascardo/linux.git]
/
drivers
/
misc
/
sgi-gru
/
grufault.c
diff --git
a/drivers/misc/sgi-gru/grufault.c
b/drivers/misc/sgi-gru/grufault.c
index
8c389d6
..
3ee698a
100644
(file)
--- 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: