Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e3f1caeef9a70b0699518092d653c15274b025ab
Commit:     e3f1caeef9a70b0699518092d653c15274b025ab
Parent:     8a336b0a4b6dfacc8cc5fd617ba1e1904077de2d
Author:     Suresh Siddha <[EMAIL PROTECTED]>
AuthorDate: Wed May 2 19:27:20 2007 +0200
Committer:  Andi Kleen <[EMAIL PROTECTED]>
CommitDate: Wed May 2 19:27:20 2007 +0200

    [PATCH] x86-64: set node_possible_map at runtime - try 2
    
    Set the node_possible_map at runtime on x86_64.  On a non NUMA system,
    num_possible_nodes() will now say '1'.
    
    Signed-off-by: Suresh Siddha <[EMAIL PROTECTED]>
    Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Eric Dumazet <[EMAIL PROTECTED]>
    Cc: David Rientjes <[EMAIL PROTECTED]>
    Cc: Christoph Lameter <[EMAIL PROTECTED]>
---
 arch/x86_64/mm/k8topology.c |    7 ++-----
 arch/x86_64/mm/numa.c       |   10 ++++++++--
 arch/x86_64/mm/srat.c       |    8 +++++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c
index b5b8dba..60e860e 100644
--- a/arch/x86_64/mm/k8topology.c
+++ b/arch/x86_64/mm/k8topology.c
@@ -49,11 +49,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long 
end)
        int found = 0;
        u32 reg;
        unsigned numnodes;
-       nodemask_t nodes_parsed;
        unsigned dualcore = 0;
 
-       nodes_clear(nodes_parsed);
-
        if (!early_pci_allowed())
                return -1;
 
@@ -102,7 +99,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long 
end)
                               nodeid, (base>>8)&3, (limit>>8) & 3); 
                        return -1; 
                }       
-               if (node_isset(nodeid, nodes_parsed)) { 
+               if (node_isset(nodeid, node_possible_map)) {
                        printk(KERN_INFO "Node %d already present. Skipping\n", 
                               nodeid);
                        continue;
@@ -155,7 +152,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long 
end)
 
                prevbase = base;
 
-               node_set(nodeid, nodes_parsed);
+               node_set(nodeid, node_possible_map);
        } 
 
        if (!found)
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 5ee07bc..5154894 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -295,7 +295,7 @@ static int __init setup_node_range(int nid, struct bootnode 
*nodes, u64 *addr,
                ret = -1;
        }
        nodes[nid].end = *addr;
-       node_set_online(nid);
+       node_set(nid, node_possible_map);
        printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid,
               nodes[nid].start, nodes[nid].end,
               (nodes[nid].end - nodes[nid].start) >> 20);
@@ -479,7 +479,7 @@ out:
         * SRAT.
         */
        remove_all_active_ranges();
-       for_each_online_node(i) {
+       for_each_node_mask(i, node_possible_map) {
                e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
                                                nodes[i].end >> PAGE_SHIFT);
                setup_node_bootmem(i, nodes[i].start, nodes[i].end);
@@ -494,20 +494,25 @@ void __init numa_initmem_init(unsigned long start_pfn, 
unsigned long end_pfn)
 { 
        int i;
 
+       nodes_clear(node_possible_map);
+
 #ifdef CONFIG_NUMA_EMU
        if (cmdline && !numa_emulation(start_pfn, end_pfn))
                return;
+       nodes_clear(node_possible_map);
 #endif
 
 #ifdef CONFIG_ACPI_NUMA
        if (!numa_off && !acpi_scan_nodes(start_pfn << PAGE_SHIFT,
                                          end_pfn << PAGE_SHIFT))
                return;
+       nodes_clear(node_possible_map);
 #endif
 
 #ifdef CONFIG_K8_NUMA
        if (!numa_off && !k8_scan_nodes(start_pfn<<PAGE_SHIFT, 
end_pfn<<PAGE_SHIFT))
                return;
+       nodes_clear(node_possible_map);
 #endif
        printk(KERN_INFO "%s\n",
               numa_off ? "NUMA turned off" : "No NUMA configuration found");
@@ -521,6 +526,7 @@ void __init numa_initmem_init(unsigned long start_pfn, 
unsigned long end_pfn)
        memnodemap[0] = 0;
        nodes_clear(node_online_map);
        node_set_online(0);
+       node_set(0, node_possible_map);
        for (i = 0; i < NR_CPUS; i++)
                numa_set_node(i, 0);
        node_to_cpumask[0] = cpumask_of_cpu(0);
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
index 2efe215..1e76bb0 100644
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86_64/mm/srat.c
@@ -419,19 +419,21 @@ int __init acpi_scan_nodes(unsigned long start, unsigned 
long end)
                return -1;
        }
 
+       node_possible_map = nodes_parsed;
+
        /* Finally register nodes */
-       for_each_node_mask(i, nodes_parsed)
+       for_each_node_mask(i, node_possible_map)
                setup_node_bootmem(i, nodes[i].start, nodes[i].end);
        /* Try again in case setup_node_bootmem missed one due
           to missing bootmem */
-       for_each_node_mask(i, nodes_parsed)
+       for_each_node_mask(i, node_possible_map)
                if (!node_online(i))
                        setup_node_bootmem(i, nodes[i].start, nodes[i].end);
 
        for (i = 0; i < NR_CPUS; i++) {
                if (cpu_to_node[i] == NUMA_NO_NODE)
                        continue;
-               if (!node_isset(cpu_to_node[i], nodes_parsed))
+               if (!node_isset(cpu_to_node[i], node_possible_map))
                        numa_set_node(i, NUMA_NO_NODE);
        }
        numa_init_array();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to