From: Andrew Morton <akpm@osdl.org>
Date: Fri, 24 Mar 2006 10:34:46 +0000 (-0800)
Subject: [PATCH] powerpc: hot_add_scn_to_nid() build fix
X-Git-Tag: v2.6.17-rc1~165^2~50
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=069007ae07ab9286fbe42e9a66b78e184f752a05;hp=6088857b169c64e6e9672a2a66e76db3e957d5db;p=linux-2.6

[PATCH] powerpc: hot_add_scn_to_nid() build fix

The return statement is to prevent `warning: 'nid' might be used uninitialized
in this function'.

Cc: Nathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index e89b22aa53..0a335f3497 100644
--- a/arch/powerpc/mm/numa.c
+++ b/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 @@ ha_new_range:
 			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: