[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>
This commit is contained in:
committed by
Paul Mackerras
parent
6088857b16
commit
069007ae07
@@ -756,6 +756,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
|
|||||||
struct device_node *memory = NULL;
|
struct device_node *memory = NULL;
|
||||||
nodemask_t nodes;
|
nodemask_t nodes;
|
||||||
int default_nid = any_online_node(NODE_MASK_ALL);
|
int default_nid = any_online_node(NODE_MASK_ALL);
|
||||||
|
int nid;
|
||||||
|
|
||||||
if (!numa_enabled || (min_common_depth < 0))
|
if (!numa_enabled || (min_common_depth < 0))
|
||||||
return default_nid;
|
return default_nid;
|
||||||
@@ -790,6 +791,7 @@ ha_new_range:
|
|||||||
goto ha_new_range;
|
goto ha_new_range;
|
||||||
}
|
}
|
||||||
BUG(); /* section address should be found above */
|
BUG(); /* section address should be found above */
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* Temporary code to ensure that returned node is not empty */
|
/* Temporary code to ensure that returned node is not empty */
|
||||||
got_nid:
|
got_nid:
|
||||||
|
Reference in New Issue
Block a user