From f6edcc19f6beeda0fa5cb4e8bc877925ab1d60bd Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 16 Feb 2011 12:13:07 +0100 Subject: [PATCH] --- yaml --- r: 234855 b: refs/heads/master c: 99df738cd28cc39054cd1a77685d4a94ed2193a4 h: refs/heads/master i: 234853: 5e743d6962b041484252ede696075f60e10f6608 234851: bee809c1550ecf90b9ecf65025b3d8067900935d 234847: 5ce8d3bcef0208a641fe21ac5afac8bc858440eb v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/amdtopology_64.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ecf5625b62bd..8881600ea0b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec8cf29b1d39aeb6ef98bc589f0c9a33a8f94c49 +refs/heads/master: 99df738cd28cc39054cd1a77685d4a94ed2193a4 diff --git a/trunk/arch/x86/mm/amdtopology_64.c b/trunk/arch/x86/mm/amdtopology_64.c index 4f822a247125..7d85cf7e0324 100644 --- a/trunk/arch/x86/mm/amdtopology_64.c +++ b/trunk/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; }