1 files changed, 12 insertions, 1 deletions

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 4920a206dce9..b4be3baa83d4 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -21,6 +21,7 @@
 #include <linux/dma-contiguous.h>
 #include <linux/sizes.h>
 #include <linux/stop_machine.h>
+#include <linux/swiotlb.h>
 
 #include <asm/cp15.h>
 #include <asm/mach-types.h>
@@ -174,6 +175,11 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max_low,
 #ifdef CONFIG_HAVE_ARCH_PFN_VALID
 int pfn_valid(unsigned long pfn)
 {
+        phys_addr_t addr = __pfn_to_phys(pfn);
+
+        if (__phys_to_pfn(addr) != pfn)
+                return 0;
+
         return memblock_is_map_memory(__pfn_to_phys(pfn));
 }
 EXPORT_SYMBOL(pfn_valid);
@@ -463,6 +469,10 @@ static void __init free_highpages(void)
  */
 void __init mem_init(void)
 {
+#ifdef CONFIG_ARM_LPAE
+        swiotlb_init(1);
+#endif
+
         set_max_mapnr(pfn_to_page(max_pfn) - mem_map);
 
         /* this will put all unused low memory onto the freelists */
@@ -623,7 +633,8 @@ static void update_sections_early(struct section_perm perms[], int n)
                 if (t->flags & PF_KTHREAD)
                         continue;
                 for_each_thread(t, s)
-                        set_section_perms(perms, n, true, s->mm);
+                        if (s->mm)
+                                set_section_perms(perms, n, true, s->mm);
         }
         set_section_perms(perms, n, true, current->active_mm);
         set_section_perms(perms, n, true, &init_mm);