projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6afc9be
)
[IA64] Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
author
Jack Steiner
<steiner@sgi.com>
Tue, 9 Dec 2008 16:51:32 +0000
(10:51 -0600)
committer
Tony 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
patch
|
blob
|
history
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: