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

[linux-beck.git] / drivers / iommu / io-pgtable-arm-v7s.c

diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
index def8ca1c982d5869a358ca69467a6f13763c46fb..f50e51c1a9c88630b03ca9095a2d6e732f671aee 100644 (file)
--- a/drivers/iommu/io-pgtable-arm-v7s.c
+++ b/drivers/iommu/io-pgtable-arm-v7s.c
@@ -633,6 +633,10 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,
 {
        struct arm_v7s_io_pgtable *data;
 
+#ifdef PHYS_OFFSET
+       if (upper_32_bits(PHYS_OFFSET))
+               return NULL;
+#endif
        if (cfg->ias > ARM_V7S_ADDR_BITS || cfg->oas > ARM_V7S_ADDR_BITS)
                return NULL;