1 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 9f7a0d24d42a..23f68e77ad1f 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -857,7 +857,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
         if (last_mapped_pfn > max_pfn_mapped)
                 max_pfn_mapped = last_mapped_pfn;
 
-        ret = __add_pages(zone, start_pfn, nr_pages);
+        ret = __add_pages(nid, zone, start_pfn, nr_pages);
         WARN_ON_ONCE(ret);
 
         return ret;
@@ -888,6 +888,8 @@ int devmem_is_allowed(unsigned long pagenr)
 {
         if (pagenr <= 256)
                 return 1;
+        if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+                return 0;
         if (!page_is_ram(pagenr))
                 return 1;
         return 0;