This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-arm / cpu-single.h

diff --git a/include/asm-arm/cpu-single.h b/include/asm-arm/cpu-single.h
index b5ec5d5..cc213ad 100644 (file)
--- a/include/asm-arm/cpu-single.h
+++ b/include/asm-arm/cpu-single.h
@@ -27,9 +27,12 @@
 #define cpu_reset                      __cpu_fn(CPU_NAME,_reset)
 #define cpu_do_idle                    __cpu_fn(CPU_NAME,_do_idle)
 #define cpu_dcache_clean_area          __cpu_fn(CPU_NAME,_dcache_clean_area)
-#define cpu_do_switch_mm               __cpu_fn(CPU_NAME,_switch_mm)
+#define cpu__switch_mm                 __cpu_fn(CPU_NAME,_switch_mm)
 #define cpu_set_pte                    __cpu_fn(CPU_NAME,_set_pte)
 
+#ifndef __ASSEMBLY__
+
+#include <asm/memory.h>
 #include <asm/page.h>
 
 struct mm_struct;
@@ -39,6 +42,20 @@ extern void cpu_proc_init(void);
 extern void cpu_proc_fin(void);
 extern int cpu_do_idle(void);
 extern void cpu_dcache_clean_area(void *, int);
-extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
+extern void cpu__switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
 extern void cpu_set_pte(pte_t *ptep, pte_t pte);
+
 extern volatile void cpu_reset(unsigned long addr);
+
+#define cpu_switch_mm(pgd,mm) cpu__switch_mm(__virt_to_phys((unsigned long)(pgd)),mm)
+
+#define cpu_get_pgd()  \
+       ({                                              \
+               unsigned long pg;                       \
+               __asm__("mrc    p15, 0, %0, c2, c0, 0"  \
+                        : "=r" (pg) : : "cc");         \
+               pg &= ~0x3fff;                          \
+               (pgd_t *)phys_to_virt(pg);              \
+       })
+
+#endif