2 files changed, 12 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index 6fe191c58084..9d67955bbc31 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -83,6 +83,13 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size)
                 return 1;
         }
 
+#ifdef CONFIG_NUMA
+        /* NUMA memory to node map */
+        if (last >= nodemap_addr && addr < nodemap_addr + nodemap_size) {
+                *addrp = nodemap_addr + nodemap_size;
+                return 1;
+        }
+#endif
         /* XXX ramdisk image here? */ 
         return 0;
 } 
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 60477244d1a3..f330f8285499 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -444,6 +444,11 @@ void __init setup_arch(char **cmdline_p)
         /* reserve ebda region */
         if (ebda_addr)
                 reserve_bootmem_generic(ebda_addr, ebda_size);
+#ifdef CONFIG_NUMA
+        /* reserve nodemap region */
+        if (nodemap_addr)
+                reserve_bootmem_generic(nodemap_addr, nodemap_size);
+#endif
 
 #ifdef CONFIG_SMP
         /*