diff --git a/drivers/staging/android/ion/heaps/ion_msm_system_heap.h b/drivers/staging/android/ion/heaps/ion_msm_system_heap.h
index 4e1986ae8916..1afca71e213c 100644
--- a/drivers/staging/android/ion/heaps/ion_msm_system_heap.h
+++ b/drivers/staging/android/ion/heaps/ion_msm_system_heap.h
@@ -9,7 +9,7 @@
 #define _ION_MSM_SYSTEM_HEAP_H
 
 #ifndef CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS
-#if defined(CONFIG_IOMMU_IO_PGTABLE_ARMV7S)
+#if defined(CONFIG_IOMMU_IO_PGTABLE_ARMV7S) && !defined(CONFIG_64BIT) && !defined(CONFIG_ARM_LPAE)
 static const unsigned int orders[] = {8, 4, 0};
 #else
 static const unsigned int orders[] = {9, 4, 0};