Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 069007ae authored by Andrew Morton's avatar Andrew Morton Committed by Paul Mackerras
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6088857b

arch/powerpc/mm/numa.c

+2 −0
Original line number Diff line number Diff line
@@ -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: