Merge branch 'v3-removal' into for-linus

Conflicts: arch/arm/boot/compressed/head.S
2012-05-21 15:15:33 +01:00
parent 4175160b06 4cdfc2ec72
commit 4ab1056766
19 changed files with 10 additions and 1454 deletions
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -432,9 +432,6 @@ do_translation_fault(unsigned long addr, unsigned int fsr,

 	index = pgd_index(addr);

-	/*
-	 * FIXME: CP15 C1 is write only on ARMv3 architectures.
-	 */
 	pgd = cpu_get_pgd() + index;
 	pgd_k = init_mm.pgd + index;