[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1437179375-23855-1-git-send-email-vitalya@ti.com>
Date: Fri, 17 Jul 2015 20:29:35 -0400
From: Vitaly Andrianov <vitalya@...com>
To: <linux@....linux.org.uk>, <ssantosh@...nel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>, <fengguang.wu@...el.com>,
<akpm@...ux-foundation.org>, <m-karicheri2@...com>
CC: Vitaly Andrianov <vitalya@...com>
Subject: [PATCH] ARM: mm: do not use virt_to_idmap() for NOMMU systems
The "ARM: mm: Introduce virt_to_idmap() with an arch hook" defines
arch_virt_to_idmap hook in arch/arm/mm/idmap.c. That breaks systems w/o
MMU because that file is not built for them.
This patch fixes this bug.
Signed-off-by: Vitaly Andrianov <vitalya@...com>
---
arch/arm/include/asm/memory.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 6f225ac..114abe3 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -279,6 +279,7 @@ static inline void *phys_to_virt(phys_addr_t x)
extern phys_addr_t (*arch_virt_to_idmap)(unsigned long x);
+#ifdef CONFIG_MMU
/*
* These are for systems that have a hardware interconnect supported alias of
* physical memory for idmap purposes. Most cases should leave these
@@ -293,6 +294,9 @@ static inline phys_addr_t __virt_to_idmap(unsigned long x)
}
#define virt_to_idmap(x) __virt_to_idmap((unsigned long)(x))
+#else
+#define virt_to_idmap(x) __virt_to_phys((unsigned long)(x))
+#endif
/*
* Virtual <-> DMA view memory address translations
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists