git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: Prohibit ioremap() on kernel managed RAM
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
ioremap.c
diff --git
a/arch/arm/mm/ioremap.c
b/arch/arm/mm/ioremap.c
index
28c8b95
..
03f1193
100644
(file)
--- a/
arch/arm/mm/ioremap.c
+++ b/
arch/arm/mm/ioremap.c
@@
-268,6
+268,12
@@
void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
return NULL;
if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
return NULL;
+ /*
+ * Don't allow RAM to be mapped - this causes problems with ARMv6+
+ */
+ if (WARN_ON(pfn_valid(pfn)))
+ return NULL;
+
type = get_mem_type(mtype);
if (!type)
return NULL;
type = get_mem_type(mtype);
if (!type)
return NULL;