3 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 03823e784f63..c43c71455566 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -1012,6 +1012,7 @@ config ARCH_SUPPORTS_BIG_ENDIAN
 
 config ARM_KERNMEM_PERMS
         bool "Restrict kernel memory permissions"
+        depends on MMU
         help
           If this is set, kernel memory other than kernel text (and rodata)
           will be made non-executable. The tradeoff is that each region is
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
index 91892569710f..845769e41332 100644
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -144,21 +144,17 @@ static void flush_context(unsigned int cpu)
         /* Update the list of reserved ASIDs and the ASID bitmap. */
         bitmap_clear(asid_map, 0, NUM_USER_ASIDS);
         for_each_possible_cpu(i) {
-                if (i == cpu) {
-                        asid = 0;
-                } else {
-                        asid = atomic64_xchg(&per_cpu(active_asids, i), 0);
-                        /*
-                         * If this CPU has already been through a
-                         * rollover, but hasn't run another task in
-                         * the meantime, we must preserve its reserved
-                         * ASID, as this is the only trace we have of
-                         * the process it is still running.
-                         */
-                        if (asid == 0)
-                                asid = per_cpu(reserved_asids, i);
-                        __set_bit(asid & ~ASID_MASK, asid_map);
-                }
+                asid = atomic64_xchg(&per_cpu(active_asids, i), 0);
+                /*
+                 * If this CPU has already been through a
+                 * rollover, but hasn't run another task in
+                 * the meantime, we must preserve its reserved
+                 * ASID, as this is the only trace we have of
+                 * the process it is still running.
+                 */
+                if (asid == 0)
+                        asid = per_cpu(reserved_asids, i);
+                __set_bit(asid & ~ASID_MASK, asid_map);
                 per_cpu(reserved_asids, i) = asid;
         }
 
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index a673c7f7e208..903dba064a03 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2048,6 +2048,9 @@ static void arm_teardown_iommu_dma_ops(struct device *dev)
 {
         struct dma_iommu_mapping *mapping = dev->archdata.mapping;
 
+        if (!mapping)
+                return;
+
         __arm_iommu_detach_device(dev);
         arm_iommu_release_mapping(mapping);
 }