patch-2.4.0-test9 linux/include/asm-arm/cpu-single.h

• Lines: 106
• Date: Mon Sep 18 15:15:23 2000
• Orig file: v2.4.0-test8/linux/include/asm-arm/cpu-single.h
• Orig date: Mon Mar 27 10:46:29 2000

diff -u --recursive --new-file v2.4.0-test8/linux/include/asm-arm/cpu-single.h linux/include/asm-arm/cpu-single.h
@@ -1,4 +1,13 @@
 /*
+ *  linux/include/asm-arm/cpu-single.h
+ *
+ *  Copyright (C) 2000 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/*
  * Single CPU
  */
 #ifdef __STDC__
@@ -9,33 +18,36 @@
 #define cpu_fn(name,x)		__cpu_fn(name,x)
 
 /*
- * If we are supporting multiple CPUs, then
- * we must use a table of function pointers
- * for this lot.  Otherwise, we can optimise
- * the table away.
+ * If we are supporting multiple CPUs, then we must use a table of
+ * function pointers for this lot.  Otherwise, we can optimise the
+ * table away.
  */
 #define cpu_data_abort			cpu_fn(CPU_NAME,_data_abort)
 #define cpu_check_bugs			cpu_fn(CPU_NAME,_check_bugs)
 #define cpu_proc_init			cpu_fn(CPU_NAME,_proc_init)
 #define cpu_proc_fin			cpu_fn(CPU_NAME,_proc_fin)
+#define cpu_reset			cpu_fn(CPU_NAME,_reset)
 #define cpu_do_idle			cpu_fn(CPU_NAME,_do_idle)
 
-#define cpu_flush_cache_all		cpu_fn(CPU_NAME,_flush_cache_all)
-#define cpu_flush_cache_area		cpu_fn(CPU_NAME,_flush_cache_area)
-#define cpu_flush_cache_entry		cpu_fn(CPU_NAME,_flush_cache_entry)
-#define cpu_clean_cache_area		cpu_fn(CPU_NAME,_clean_cache_area)
+#define cpu_cache_clean_invalidate_all	cpu_fn(CPU_NAME,_cache_clean_invalidate_all)
+#define cpu_cache_clean_invalidate_range cpu_fn(CPU_NAME,_cache_clean_invalidate_range)
 #define cpu_flush_ram_page		cpu_fn(CPU_NAME,_flush_ram_page)
-#define cpu_flush_tlb_all		cpu_fn(CPU_NAME,_flush_tlb_all)
-#define cpu_flush_tlb_area		cpu_fn(CPU_NAME,_flush_tlb_area)
-#define cpu_flush_tlb_page		cpu_fn(CPU_NAME,_flush_tlb_page)
+
+#define cpu_dcache_invalidate_range	cpu_fn(CPU_NAME,_dcache_invalidate_range)
+#define cpu_dcache_clean_range		cpu_fn(CPU_NAME,_dcache_clean_range)
+#define cpu_dcache_clean_page		cpu_fn(CPU_NAME,_dcache_clean_page)
+#define cpu_dcache_clean_entry		cpu_fn(CPU_NAME,_dcache_clean_entry)
+
+#define cpu_icache_invalidate_range	cpu_fn(CPU_NAME,_icache_invalidate_range)
+#define cpu_icache_invalidate_page	cpu_fn(CPU_NAME,_icache_invalidate_page)
+
+#define cpu_tlb_invalidate_all		cpu_fn(CPU_NAME,_tlb_invalidate_all)
+#define cpu_tlb_invalidate_range	cpu_fn(CPU_NAME,_tlb_invalidate_range)
+#define cpu_tlb_invalidate_page		cpu_fn(CPU_NAME,_tlb_invalidate_page)
+
 #define cpu_set_pgd			cpu_fn(CPU_NAME,_set_pgd)
 #define cpu_set_pmd			cpu_fn(CPU_NAME,_set_pmd)
 #define cpu_set_pte			cpu_fn(CPU_NAME,_set_pte)
-#define cpu_reset			cpu_fn(CPU_NAME,_reset)
-#define cpu_flush_icache_area		cpu_fn(CPU_NAME,_flush_icache_area)
-#define cpu_cache_wback_area		cpu_fn(CPU_NAME,_cache_wback_area)
-#define cpu_cache_purge_area		cpu_fn(CPU_NAME,_cache_purge_area)
-#define cpu_flush_icache_page		cpu_fn(CPU_NAME,_flush_icache_page)
 
 #ifndef __ASSEMBLY__
 
@@ -51,22 +63,26 @@
 extern void cpu_proc_fin(void);
 extern int cpu_do_idle(int mode);
 
-extern void cpu_flush_cache_all(void);
-extern void cpu_flush_cache_area(unsigned long address, unsigned long end, int flags);
-extern void cpu_flush_cache_entry(unsigned long address);
-extern void cpu_clean_cache_area(unsigned long start, unsigned long size);
-extern void cpu_flush_ram_page(unsigned long page);
-extern void cpu_flush_tlb_all(void);
-extern void cpu_flush_tlb_area(unsigned long address, unsigned long end, int flags);
-extern void cpu_flush_tlb_page(unsigned long address, int flags);
+extern void cpu_cache_clean_invalidate_all(void);
+extern void cpu_cache_clean_invalidate_range(unsigned long address, unsigned long end, int flags);
+extern void cpu_flush_ram_page(void *virt_page);
+
+extern void cpu_dcache_invalidate_range(unsigned long start, unsigned long end);
+extern void cpu_dcache_clean_range(unsigned long start, unsigned long end);
+extern void cpu_dcache_clean_page(void *virt_page);
+extern void cpu_dcache_clean_entry(unsigned long address);
+
+extern void cpu_icache_invalidate_range(unsigned long start, unsigned long end);
+extern void cpu_icache_invalidate_page(void *virt_page);
+
+extern void cpu_tlb_invalidate_all(void);
+extern void cpu_tlb_invalidate_range(unsigned long address, unsigned long end);
+extern void cpu_tlb_invalidate_page(unsigned long address, int flags);
+
 extern void cpu_set_pgd(unsigned long pgd_phys);
 extern void cpu_set_pmd(pmd_t *pmdp, pmd_t pmd);
 extern void cpu_set_pte(pte_t *ptep, pte_t pte);
 extern volatile void cpu_reset(unsigned long addr);
-extern void cpu_flush_icache_area(unsigned long start, unsigned long size);
-extern void cpu_cache_wback_area(unsigned long start, unsigned long end);
-extern void cpu_cache_purge_area(unsigned long start, unsigned long end);
-extern void cpu_flush_icache_page(unsigned long virt);
 
 #define cpu_switch_mm(pgd,tsk) cpu_set_pgd(__virt_to_phys((unsigned long)(pgd)))