[ARM PATCH] 1911/1: fix of odd PMD handling in do_translation_fault()

Toshihiro Kobayashi · Russell King · commit 52f48d910128 · 2004-06-04T22:03:16.000+01:00
Patch from Toshihiro Kobayashi

do_translation_fault() in arch/arm/mm/fault.c will never resolve odd PMD.
This patch fixes that problem.
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
@@ -348,7 +348,7 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
 	if (pmd_none(*pmd_k))
 		goto bad_area;
 
-	set_pmd(pmd, *pmd_k);
+	copy_pmd(pmd, pmd_k);
 	return 0;
 
 bad_area:
diff --git a/include/asm-arm/pgtable.h b/include/asm-arm/pgtable.h
@@ -312,6 +312,13 @@ PTE_BIT_FUNC(mkyoung,   |= L_PTE_YOUNG);
 		flush_pmd_entry(pmdp);	\
 	} while (0)
 
+#define copy_pmd(pmdpd,pmdps)		\
+	do {				\
+		pmdpd[0] = pmdps[0];	\
+		pmdpd[1] = pmdps[1];	\
+		flush_pmd_entry(pmdpd);	\
+	} while (0)
+
 #define pmd_clear(pmdp)			\
 	do {				\
 		pmdp[0] = __pmd(0);	\
