linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Nathan Lynch <nathanl@austin.ibm.com>
To: linuxppc-dev@ozlabs.org
Cc: Nathan Lynch <nathanl@austin.ibm.com>
Subject: [PATCH 1/7] powerpc numa: fix boot_cpuid always assigned to node 0
Date: Mon, 20 Mar 2006 18:34:15 -0600	[thread overview]
Message-ID: <11429012552739-git-send-email-nathanl@austin.ibm.com> (raw)
In-Reply-To: <1142901225978-git-send-email-nathanl@austin.ibm.com>

At boot, the numa code is assigning boot_cpuid to node 0
unconditionally.  Basically, numa_setup_cpu is being stupid about it,
but this is the minimal fix -- just call numa_setup_cpu(boot_cpuid)
later, after all nodes have been set online.

Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com>

---

 arch/powerpc/mm/numa.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

d5ecb195c3b93cb954264e075c7fe29a0bdc6db7
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 2863a91..b813bad 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -375,7 +375,7 @@ static int __init parse_numa_properties(
 {
 	struct device_node *cpu = NULL;
 	struct device_node *memory = NULL;
-	int max_domain;
+	int max_domain = 0;
 	unsigned long i;
 
 	if (numa_enabled == 0) {
@@ -389,8 +389,6 @@ static int __init parse_numa_properties(
 	if (min_common_depth < 0)
 		return min_common_depth;
 
-	max_domain = numa_setup_cpu(boot_cpuid);
-
 	/*
 	 * Even though we connect cpus to numa domains later in SMP init,
 	 * we need to know the maximum node id now. This is because each
@@ -469,6 +467,8 @@ new_range:
 	for (i = 0; i <= max_domain; i++)
 		node_set_online(i);
 
+	max_domain = numa_setup_cpu(boot_cpuid);
+
 	return 0;
 }
 
-- 
1.2.4

  reply	other threads:[~2006-03-21  1:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-03-21  0:33 [PATCH 0/7] powerpc numa updates and fixes Nathan Lynch
2006-03-21  0:34 ` Nathan Lynch [this message]
2006-03-21  0:34 ` [PATCH 2/7] powerpc numa: Minor debugging code changes Nathan Lynch
2006-03-21 18:27   ` Dave Hansen
2006-03-21 18:54     ` Nathan Lynch
2006-03-21  0:35 ` [PATCH 3/7] powerpc numa: Minor cpu hotplug-related cleanups Nathan Lynch
2006-03-21  0:35 ` [PATCH 4/7] powerpc numa: Get rid of "numa domain" terminology Nathan Lynch
2006-03-21  0:36 ` [PATCH 5/7] powerpc numa: Consolidate handling of Power4 special case Nathan Lynch
2006-03-21  3:54   ` Jon Mason
2006-03-21  0:36 ` [PATCH 6/7] powerpc numa: Support sparse online node map Nathan Lynch
2006-03-21  0:37 ` [PATCH 7/7] powerpc numa: Consolidate assignment of cpus to nodes Nathan Lynch
2006-03-21 18:38   ` Dave Hansen
2006-03-21 19:16     ` Nathan Lynch
2006-03-21 23:09       ` Michael Ellerman
2006-03-21 23:22         ` Nathan Lynch
2006-03-21 23:34           ` Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11429012552739-git-send-email-nathanl@austin.ibm.com \
    --to=nathanl@austin.ibm.com \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).