Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

Linus Torvalds · Linus Torvalds · commit eb013086e1ad · 2004-06-04T02:50:11.000-07:00
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
@@ -40,7 +40,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	 */
 	cache_type = read_cpuid(CPUID_CACHETYPE);
 	if (cache_type != read_cpuid(CPUID_ID)) {
-		aliasing = (cache_type | cache_type >> 12) & (1 << 9);
+		aliasing = (cache_type | cache_type >> 12) & (1 << 11);
 		if (aliasing)
 			do_align = filp || flags & MAP_SHARED;
 	}
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);	\

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,`
`40`	`40`	`*/`
`41`	`41`	`cache_type = read_cpuid(CPUID_CACHETYPE);`
`42`	`42`	`if (cache_type != read_cpuid(CPUID_ID)) {`
`43`		`- aliasing = (cache_type \| cache_type >> 12) & (1 << 9);`
	`43`	`+ aliasing = (cache_type \| cache_type >> 12) & (1 << 11);`
`44`	`44`	`if (aliasing)`
`45`	`45`	`do_align = filp \|\| flags & MAP_SHARED;`
`46`	`46`	`}`