summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-02-16 12:13:07 +0100
committerTejun Heo <tj@kernel.org>2011-02-16 12:13:07 +0100
commit99df738cd28cc39054cd1a77685d4a94ed2193a4 (patch)
tree169dd669d3be665dd588ccc4f908e8289a5ed866
parentx86-64, NUMA: Use common {cpu|mem}_nodes_parsed (diff)
downloadlinux-99df738cd28cc39054cd1a77685d4a94ed2193a4.tar.xz
linux-99df738cd28cc39054cd1a77685d4a94ed2193a4.zip
x86-64, NUMA: Remove local variable found from amd_numa_init()
Use weight count on mem_nodes_parsed instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Brian Gerst <brgerst@gmail.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Shaohui Zheng <shaohui.zheng@intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/mm/amdtopology_64.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
index 4f822a247125..7d85cf7e0324 100644
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@ -74,7 +74,7 @@ int __init amd_numa_init(void)
unsigned long end = PFN_PHYS(max_pfn);
unsigned numnodes;
unsigned long prevbase;
- int i, nb, found = 0;
+ int i, nb;
u32 nodeid, reg;
if (!early_pci_allowed())
@@ -165,8 +165,6 @@ int __init amd_numa_init(void)
pr_info("Node %d MemBase %016lx Limit %016lx\n",
nodeid, base, limit);
- found++;
-
nodes[nodeid].start = base;
nodes[nodeid].end = limit;
@@ -176,7 +174,7 @@ int __init amd_numa_init(void)
node_set(nodeid, cpu_nodes_parsed);
}
- if (!found)
+ if (!nodes_weight(mem_nodes_parsed))
return -ENOENT;
return 0;
}