Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/memblock

1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index bdc447fd4766..31053a951c34 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -41,6 +41,7 @@
 #include <linux/tboot.h>
 #include <linux/dmi.h>
 #include <linux/pci-ats.h>
+#include <linux/memblock.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
 
@@ -2188,18 +2189,6 @@ static inline void iommu_prepare_isa(void)
 
 static int md_domain_init(struct dmar_domain *domain, int guest_width);
 
-static int __init si_domain_work_fn(unsigned long start_pfn,
-                                    unsigned long end_pfn, void *datax)
-{
-        int *ret = datax;
-
-        *ret = iommu_domain_identity_map(si_domain,
-                                         (uint64_t)start_pfn << PAGE_SHIFT,
-                                         (uint64_t)end_pfn << PAGE_SHIFT);
-        return *ret;
-
-}
-
 static int __init si_domain_init(int hw)
 {
         struct dmar_drhd_unit *drhd;
@@ -2231,9 +2220,15 @@ static int __init si_domain_init(int hw)
                 return 0;
 
         for_each_online_node(nid) {
-                work_with_active_regions(nid, si_domain_work_fn, &ret);
-                if (ret)
-                        return ret;
+                unsigned long start_pfn, end_pfn;
+                int i;
+
+                for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) {
+                        ret = iommu_domain_identity_map(si_domain,
+                                        PFN_PHYS(start_pfn), PFN_PHYS(end_pfn));
+                        if (ret)
+                                return ret;
+                }
         }
 
         return 0;