From: Andrew Morton <akpm@osdl.org>

Cc: "Moore, Robert" <robert.moore@intel.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/mm/srat.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/x86_64/mm/srat.c~git-acpi-build-fix-99 arch/x86_64/mm/srat.c
--- a/arch/x86_64/mm/srat.c~git-acpi-build-fix-99
+++ a/arch/x86_64/mm/srat.c
@@ -338,7 +338,8 @@ acpi_numa_memory_affinity_init(struct ac
 	push_node_boundaries(node, nd->start >> PAGE_SHIFT,
 						nd->end >> PAGE_SHIFT);
 
- 	if (ma->flags.hot_pluggable && (reserve_hotadd(node, start, end) < 0)) {
+ 	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) &&
+			(reserve_hotadd(node, start, end) < 0)) {
 		/* Ignore hotadd region. Undo damage */
 		printk(KERN_NOTICE "SRAT: Hotplug region ignored\n");
 		*nd = oldnode;
_