[PATCH v4 4/8] ARM: idmap: add header file for identity mapping functions
From: Will Deacon <hidden>
Date: 2011-08-23 21:46:48
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
The identity mappings functions are useful outside of SMP booting, so expose them through their own header file. Signed-off-by: Will Deacon <redacted> --- arch/arm/include/asm/idmap.h | 11 +++++++++++ arch/arm/include/asm/pgtable.h | 3 --- arch/arm/kernel/process.c | 3 +-- arch/arm/kernel/smp.c | 1 + arch/arm/mm/idmap.c | 5 +++++ 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 arch/arm/include/asm/idmap.h
diff --git a/arch/arm/include/asm/idmap.h b/arch/arm/include/asm/idmap.h
new file mode 100644
index 0000000..fe7ea86
--- /dev/null
+++ b/arch/arm/include/asm/idmap.h@@ -0,0 +1,11 @@ +#ifndef _ARM_IDMAP_H +#define _ARM_IDMAP_H + +#include <asm/page.h> + +void identity_mapping_add(pgd_t *pgd, unsigned long addr, unsigned long end); +void identity_mapping_del(pgd_t *pgd, unsigned long addr, unsigned long end); + +void setup_mm_for_reboot(char mode); + +#endif /* _ARM_IDMAP_H */
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 5750704..9d559a8 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h@@ -474,9 +474,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) #define pgtable_cache_init() do { } while (0) -void identity_mapping_add(pgd_t *, unsigned long, unsigned long); -void identity_mapping_del(pgd_t *, unsigned long, unsigned long); - #endif /* !__ASSEMBLY__ */ #endif /* CONFIG_MMU */
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 1a347f4..89fe6ee 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c@@ -33,6 +33,7 @@ #include <linux/cpuidle.h> #include <asm/cacheflush.h> +#include <asm/idmap.h> #include <asm/leds.h> #include <asm/processor.h> #include <asm/system.h>
@@ -57,8 +58,6 @@ static const char *isa_modes[] = { "ARM" , "Thumb" , "Jazelle", "ThumbEE" }; -extern void setup_mm_for_reboot(char mode); - static volatile int hlt_counter; #include <mach/system.h>
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index d88ff02..96a7956 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c@@ -39,6 +39,7 @@ #include <asm/tlbflush.h> #include <asm/ptrace.h> #include <asm/localtimer.h> +#include <asm/idmap.h> /* * as from 2.5, kernels no longer have an init_tasks structure
diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c
index 2be9139..e99dc38 100644
--- a/arch/arm/mm/idmap.c
+++ b/arch/arm/mm/idmap.c@@ -1,6 +1,7 @@ #include <linux/kernel.h> #include <asm/cputype.h> +#include <asm/idmap.h> #include <asm/pgalloc.h> #include <asm/pgtable.h>
@@ -71,6 +72,10 @@ void identity_mapping_del(pgd_t *pgd, unsigned long addr, unsigned long end) idmap_del_pud(pgd, addr, next); } while (pgd++, addr = next, addr != end); } +#else +void identity_mapping_del(pgd_t *pgd, unsigned long addr, unsigned long end) +{ +} #endif /*
--
1.7.0.4