1 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index a9dd0b7ad618..4a6989e47a53 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -327,6 +327,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;
@@ -1078,7 +1080,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
         unsigned long start_pfn = start >> PAGE_SHIFT;
         unsigned long nr_pages = size >> PAGE_SHIFT;
 
-        return __add_pages(zone, start_pfn, nr_pages);
+        return __add_pages(nid, zone, start_pfn, nr_pages);
 }
 #endif