summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/pgtable.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 21:27:54 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-12-06 21:27:54 +0100
commit3ee0fc5ca129cbae81c073756febcb1c552af446 (patch)
tree08f061c1ec9e948df760a0746441bec9f290d774 /arch/arm/include/asm/pgtable.h
parentARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart c... (diff)
parentARM: SMP: use idmap_pgd for mapping MMU enable during secondary booting (diff)
downloadlinux-3ee0fc5ca129cbae81c073756febcb1c552af446.tar.xz
linux-3ee0fc5ca129cbae81c073756febcb1c552af446.zip
Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/include/asm/pgtable.h')
-rw-r--r--arch/arm/include/asm/pgtable.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index bcae9b81a6d0..a784859cc7a9 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -347,9 +347,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 */