[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20081209165132.GA26860@sgi.com>
Date: Tue, 9 Dec 2008 10:51:32 -0600
From: Jack Steiner <steiner@....com>
To: linux-kernel@...r.kernel.org, linux-ia64@...r.kernel.org
Cc: a.beregalov@...il.com, kernel-testers@...r.kernel.org
Subject: [PATCH] - Fix GRU compile error w/o CONFIG_HUGETLB_PAGE
Eliminate compile error when compiling without CONFIG_HUGETLB_PAGE.
Signed-off-by: Jack Steiner <steiner@....com>
---
drivers/misc/sgi-gru/grufault.c | 4 ++++
1 file changed, 4 insertions(+)
Index: linux/drivers/misc/sgi-gru/grufault.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufault.c 2008-12-08 08:25:57.000000000 -0600
+++ linux/drivers/misc/sgi-gru/grufault.c 2008-12-09 09:35:02.000000000 -0600
@@ -254,7 +254,11 @@ static int atomic_pte_lookup(struct vm_a
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:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists