Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A number of ARM fixes, the biggest is fixing a regression caused by
  appended DT blobs exceeding 64K, causing the decompressor fixup code
  to fail to patch the DT blob.  Another important fix is for the ASID
  allocator from Will Deacon which prevents some rare crashes seen on
  some systems.  Lastly, there's a build fix for v7M systems when printk
  support is disabled.

  The last two remaining fixes are more cosmetic - the IOMMU one
  prevents an annoying harmless warning message, and we disable the
  kernel strict memory permissions on non-MMU which can't support it
  anyway"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover
  ARM: 8298/1: ARM_KERNMEM_PERMS only works with MMU enabled
  ARM: 8295/1: fix v7M build for !CONFIG_PRINTK
  ARM: 8294/1: ATAG_DTB_COMPAT: remove the DT workspace's hardcoded 64KB size
  ARM: 8288/1: dma-mapping: don't detach devices without an IOMMU during teardown

diff --cc arch/arm/mm/dma-mapping.c
index a673c7f7e208efe1bc9b2e2d4ff0cb8ab6a1c5da,f142ddd6c40a1c0bc3cddc9f642c7726e0c68bdd..903dba064a034c7e5d9fff950d3fa334301130d9
--- 1/arch/arm/mm/dma-mapping.c
--- 2/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -2048,7 -2025,10 +2048,10 @@@ static void arm_teardown_iommu_dma_ops(
  {
        struct dma_iommu_mapping *mapping = dev->archdata.mapping;
  
 -      arm_iommu_detach_device(dev);
+       if (!mapping)
+               return;
+ 
 +      __arm_iommu_detach_device(dev);
        arm_iommu_release_mapping(mapping);
  }