From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 24 Jul 2009 11:35:04 +0000 (+0100)
Subject: nommu: Add #ifdef CONFIG_MMU around the PTE sanity checks
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8b79d5f217d7fc7d6b85ee5b10899f2bd20b64ed;p=deliverable%2Flinux.git

nommu: Add #ifdef CONFIG_MMU around the PTE sanity checks

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

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.