summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2009-07-24 13:35:04 +0200
committerCatalin Marinas <catalin.marinas@arm.com>2009-07-24 13:35:04 +0200
commit8b79d5f217d7fc7d6b85ee5b10899f2bd20b64ed (patch)
tree0419d82bb5c582425e94b45fdb4baec20c5ab8e4 /arch
parentnommu: Include asm/setup.h in arch/arm/mm/nommu.c (diff)
downloadlinux-8b79d5f217d7fc7d6b85ee5b10899f2bd20b64ed.tar.xz
linux-8b79d5f217d7fc7d6b85ee5b10899f2bd20b64ed.zip
nommu: Add #ifdef CONFIG_MMU around the PTE sanity checks
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/proc-macros.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 54b1f721dec8..f1559c227784 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -77,6 +77,7 @@
* Sanity check the PTE configuration for the code below - which makes
* certain assumptions about how these bits are layed out.
*/
+#ifdef CONFIG_MMU
#if L_PTE_SHARED != PTE_EXT_SHARED
#error PTE shared bit mismatch
#endif
@@ -90,6 +91,7 @@
L_PTE_FILE+L_PTE_PRESENT) > L_PTE_SHARED
#error Invalid Linux PTE bit settings
#endif
+#endif /* CONFIG_MMU */
/*
* The ARMv6 and ARMv7 set_pte_ext translation function.