From 7d6210fedfaaa4f8919597dc8e6d5dada22e1f60 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Wed, 2 May 2007 19:27:21 +0200 Subject: [PATCH] --- yaml --- r: 53936 b: refs/heads/master c: 3bea9c9793a17053e05d970e5d90d48fc9fce07d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/mm/k8topology.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 13c98a418be9..854f08dbfe73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5bcb5635a03da3158f121ae20ccbbf72b4fc62a +refs/heads/master: 3bea9c9793a17053e05d970e5d90d48fc9fce07d diff --git a/trunk/arch/x86_64/mm/k8topology.c b/trunk/arch/x86_64/mm/k8topology.c index 60e860e5ef4c..f983c75825d0 100644 --- a/trunk/arch/x86_64/mm/k8topology.c +++ b/trunk/arch/x86_64/mm/k8topology.c @@ -62,6 +62,8 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) reg = read_pci_config(0, nb, 0, 0x60); numnodes = ((reg >> 4) & 0xF) + 1; + if (numnodes <= 1) + return -1; printk(KERN_INFO "Number of nodes %d\n", numnodes);