From 882515921b3704b5802d362b668cf9565eb96489 Mon Sep 17 00:00:00 2001
From: "Fabio M. Di Nitto" <fabbione@ubuntu.com>
Date: Sat, 18 Feb 2006 00:32:31 -0800
Subject: [PATCH] --- yaml --- r: 21495 b: refs/heads/master c:
 f6c1fe529217788f095f6953c2b66bec1196ad3d h: refs/heads/master i:   21493:
 186f237f9973f60e7784dbf217a7bb40043b5b8c   21491:
 c6cc4d1d6385f48e4bba115fb0bacef3ce8accad   21487:
 9efde234397f5421d3e15ed92e18df13aa82bf28 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-sparc64/pgtable.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3b4a5d50a3cd..a5fcede49b7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b234274418d6d79527c4ac3a72da446ca4cb35f
+refs/heads/master: f6c1fe529217788f095f6953c2b66bec1196ad3d
diff --git a/trunk/include/asm-sparc64/pgtable.h b/trunk/include/asm-sparc64/pgtable.h
index bc446f302ea4..bab7defd8b3e 100644
--- a/trunk/include/asm-sparc64/pgtable.h
+++ b/trunk/include/asm-sparc64/pgtable.h
@@ -354,6 +354,7 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot)
  */
 #define pgprot_noncached pgprot_noncached
 
+#ifdef CONFIG_HUGETLB_PAGE
 static inline pte_t pte_mkhuge(pte_t pte)
 {
 	unsigned long mask;
@@ -371,6 +372,7 @@ static inline pte_t pte_mkhuge(pte_t pte)
 
 	return __pte(pte_val(pte) | mask);
 }
+#endif
 
 static inline pte_t pte_mkdirty(pte_t pte)
 {