patch-2.4.3 linux/arch/arm/mm/proc-arm6,7.S

• Lines: 47
• Date: Tue Mar 6 19:44:35 2001
• Orig file: v2.4.2/linux/arch/arm/mm/proc-arm6,7.S
• Orig date: Wed Feb 21 18:20:10 2001

diff -u --recursive --new-file v2.4.2/linux/arch/arm/mm/proc-arm6,7.S linux/arch/arm/mm/proc-arm6,7.S
@@ -12,8 +12,8 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
+#include <asm/constants.h>
 #include <asm/procinfo.h>
-#include "../lib/constants.h"
 
 /*
  * Function: arm6_7_cache_clean_invalidate_all (void)
@@ -29,10 +29,10 @@
 ENTRY(cpu_arm7_cache_clean_invalidate_all)
 ENTRY(cpu_arm6_cache_clean_invalidate_range)
 ENTRY(cpu_arm7_cache_clean_invalidate_range)
-ENTRY(cpu_arm6_invalidate_icache_range)
-ENTRY(cpu_arm7_invalidate_icache_range)
-ENTRY(cpu_arm6_invalidate_icache_page)
-ENTRY(cpu_arm7_invalidate_icache_page)
+ENTRY(cpu_arm6_icache_invalidate_range)
+ENTRY(cpu_arm7_icache_invalidate_range)
+ENTRY(cpu_arm6_icache_invalidate_page)
+ENTRY(cpu_arm7_icache_invalidate_page)
 ENTRY(cpu_arm6_dcache_clean_range)
 ENTRY(cpu_arm7_dcache_clean_range)
 ENTRY(cpu_arm6_dcache_invalidate_range)
@@ -410,8 +410,8 @@
 		.word	cpu_arm6_dcache_clean_entry
 
 		/* icache */
-		.word	cpu_arm6_invalidate_icache_range
-		.word	cpu_arm6_invalidate_icache_page
+		.word	cpu_arm6_icache_invalidate_range
+		.word	cpu_arm6_icache_invalidate_page
 
 		/* tlb */
 		.word	cpu_arm6_tlb_invalidate_all
@@ -449,8 +449,8 @@
 		.word	cpu_arm7_dcache_clean_entry
 
 		/* icache */
-		.word	cpu_arm7_invalidate_icache_range
-		.word	cpu_arm7_invalidate_icache_page
+		.word	cpu_arm7_icache_invalidate_range
+		.word	cpu_arm7_icache_invalidate_page
 
 		/* tlb */
 		.word	cpu_arm7_tlb_invalidate_all