From d29b3c9665f941e1dfd7998a7799d123ce81b65e Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 28 Nov 2005 13:43:44 -0800
Subject: [PATCH] --- yaml --- r: 14711 b: refs/heads/master c:
 e0f39591cc178026607fcbbe9a53be435fe8285d h: refs/heads/master i:   14709:
 77e63aad6ee1eff7f5bd7d6ea2fe3072caed07bb   14707:
 f8c85894f249fc963989aada3eb6b290f96704a4   14703:
 e2d2ab246d19304ed992b6c2607a0b367a9d39f2 v: v3

---
 [refs]            |  2 +-
 trunk/mm/memory.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7a0d975960ed..1878a9854aed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cd9194a1b0b0fa219c31421ac64dfd38670ed49
+refs/heads/master: e0f39591cc178026607fcbbe9a53be435fe8285d
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index b57fbc636058..9ab206b829a2 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2160,6 +2160,12 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
 	spin_unlock(&mm->page_table_lock);
 	return 0;
 }
+#else
+/* Workaround for gcc 2.96 */
+int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
+{
+	return 0;
+}
 #endif /* __PAGETABLE_PUD_FOLDED */
 
 #ifndef __PAGETABLE_PMD_FOLDED
@@ -2188,6 +2194,12 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
 	spin_unlock(&mm->page_table_lock);
 	return 0;
 }
+#else
+/* Workaround for gcc 2.96 */
+int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
+{
+	return 0;
+}
 #endif /* __PAGETABLE_PMD_FOLDED */
 
 int make_pages_present(unsigned long addr, unsigned long end)