6 files changed, 29 insertions, 5 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index fd3da1dda1c9..ae4f7b5d7104 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -7,6 +7,7 @@
 #include <asm/page.h>
 #include <asm/page_types.h>
 #include <asm/sections.h>
+#include <asm/setup.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
 
@@ -304,8 +305,23 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
 #endif
 
 #ifdef CONFIG_X86_64
-        if (!after_bootmem)
+        if (!after_bootmem && !start) {
+                pud_t *pud;
+                pmd_t *pmd;
+
                 mmu_cr4_features = read_cr4();
+
+                /*
+                 * _brk_end cannot change anymore, but it and _end may be
+                 * located on different 2M pages. cleanup_highmap(), however,
+                 * can only consider _end when it runs, so destroy any
+                 * mappings beyond _brk_end here.
+                 */
+                pud = pud_offset(pgd_offset_k(_brk_end), _brk_end);
+                pmd = pmd_offset(pud, _brk_end - 1);
+                while (++pmd <= pmd_offset(pud, (unsigned long)_end - 1))
+                        pmd_clear(pmd);
+        }
 #endif
         __flush_tlb_all();
 
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index 4f115e00486b..50dc802a1c46 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -87,7 +87,7 @@ static struct kmmio_probe *get_kmmio_probe(unsigned long addr)
 {
         struct kmmio_probe *p;
         list_for_each_entry_rcu(p, &kmmio_probes, list) {
-                if (addr >= p->addr && addr <= (p->addr + p->len))
+                if (addr >= p->addr && addr < (p->addr + p->len))
                         return p;
         }
         return NULL;
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index 3daefa04ace5..d2530062fe00 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -257,7 +257,7 @@ void resume_map_numa_kva(pgd_t *pgd_base)
 }
 #endif
 
-static unsigned long calculate_numa_remap_pages(void)
+static __init unsigned long calculate_numa_remap_pages(void)
 {
         int nid;
         unsigned long size, reserve_pages = 0;
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index d73aaa892371..2d05a12029dc 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -188,6 +188,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
         const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
         int nid;
 
+        if (!end)
+                return;
+
         start = roundup(start, ZONE_ALIGN);
 
         printk(KERN_INFO "Bootmem setup node %d %016lx-%016lx\n", nodeid,
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index 16ae70fc57e7..29a0e37114f8 100644
--- a/arch/x86/mm/srat_32.c
+++ b/arch/x86/mm/srat_32.c
@@ -216,7 +216,7 @@ int __init get_memcfg_from_srat(void)
 
         if (num_memory_chunks == 0) {
                 printk(KERN_WARNING
-                         "could not finy any ACPI SRAT memory areas.\n");
+                         "could not find any ACPI SRAT memory areas.\n");
                 goto out_fail;
         }
 
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index c7d272b8574c..01765955baaf 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -28,6 +28,7 @@ int acpi_numa __initdata;
 static struct acpi_table_slit *acpi_slit;
 
 static nodemask_t nodes_parsed __initdata;
+static nodemask_t cpu_nodes_parsed __initdata;
 static struct bootnode nodes[MAX_NUMNODES] __initdata;
 static struct bootnode nodes_add[MAX_NUMNODES];
 static int found_add_area __initdata;
@@ -141,6 +142,7 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
 
         apic_id = pa->apic_id;
         apicid_to_node[apic_id] = node;
+        node_set(node, cpu_nodes_parsed);
         acpi_numa = 1;
         printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
                pxm, apic_id, node);
@@ -174,6 +176,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
         else
                 apic_id = pa->apic_id;
         apicid_to_node[apic_id] = node;
+        node_set(node, cpu_nodes_parsed);
         acpi_numa = 1;
         printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
                pxm, apic_id, node);
@@ -358,6 +361,7 @@ static void __init unparse_node(int node)
 {
         int i;
         node_clear(node, nodes_parsed);
+        node_clear(node, cpu_nodes_parsed);
         for (i = 0; i < MAX_LOCAL_APIC; i++) {
                 if (apicid_to_node[i] == node)
                         apicid_to_node[i] = NUMA_NO_NODE;
@@ -402,7 +406,8 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
                 return -1;
         }
 
-        node_possible_map = nodes_parsed;
+        /* Account for nodes with cpus and no memory */
+        nodes_or(node_possible_map, nodes_parsed, cpu_nodes_parsed);
 
         /* Finally register nodes */
         for_each_node_mask(i, node_possible_map)