From fe5978f48ff63afe4259f89e1b230dfa1a9bd3fd Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 24 Mar 2006 02:34:46 -0800 Subject: [PATCH] --- yaml --- r: 24610 b: refs/heads/master c: 069007ae07ab9286fbe42e9a66b78e184f752a05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/numa.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 57beadde7374..43ea32adcbd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6088857b169c64e6e9672a2a66e76db3e957d5db +refs/heads/master: 069007ae07ab9286fbe42e9a66b78e184f752a05 diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c index e89b22aa539e..0a335f34974c 100644 --- a/trunk/arch/powerpc/mm/numa.c +++ b/trunk/arch/powerpc/mm/numa.c @@ -756,6 +756,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr) struct device_node *memory = NULL; nodemask_t nodes; int default_nid = any_online_node(NODE_MASK_ALL); + int nid; if (!numa_enabled || (min_common_depth < 0)) return default_nid; @@ -790,6 +791,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr) goto ha_new_range; } BUG(); /* section address should be found above */ + return 0; /* Temporary code to ensure that returned node is not empty */ got_nid: