aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/mm/numa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index c916127f10c3..33d67844062c 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -195,7 +195,7 @@ static const __be32 *of_get_usable_memory(struct device_node *memory)
195 u32 len; 195 u32 len;
196 prop = of_get_property(memory, "linux,drconf-usable-memory", &len); 196 prop = of_get_property(memory, "linux,drconf-usable-memory", &len);
197 if (!prop || len < sizeof(unsigned int)) 197 if (!prop || len < sizeof(unsigned int))
198 return 0; 198 return NULL;
199 return prop; 199 return prop;
200} 200}
201 201
@@ -1154,7 +1154,7 @@ static int hot_add_drconf_scn_to_nid(struct device_node *memory,
1154 * represented in the device tree as a node (i.e. memory@XXXX) for 1154 * represented in the device tree as a node (i.e. memory@XXXX) for
1155 * each memblock. 1155 * each memblock.
1156 */ 1156 */
1157int hot_add_node_scn_to_nid(unsigned long scn_addr) 1157static int hot_add_node_scn_to_nid(unsigned long scn_addr)
1158{ 1158{
1159 struct device_node *memory; 1159 struct device_node *memory;
1160 int nid = -1; 1160 int nid = -1;
@@ -1235,7 +1235,7 @@ static u64 hot_add_drconf_memory_max(void)
1235 struct device_node *memory = NULL; 1235 struct device_node *memory = NULL;
1236 unsigned int drconf_cell_cnt = 0; 1236 unsigned int drconf_cell_cnt = 0;
1237 u64 lmb_size = 0; 1237 u64 lmb_size = 0;
1238 const __be32 *dm = 0; 1238 const __be32 *dm = NULL;
1239 1239
1240 memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); 1240 memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
1241 if (memory) { 1241 if (memory) {
@@ -1535,7 +1535,7 @@ static void topology_work_fn(struct work_struct *work)
1535} 1535}
1536static DECLARE_WORK(topology_work, topology_work_fn); 1536static DECLARE_WORK(topology_work, topology_work_fn);
1537 1537
1538void topology_schedule_update(void) 1538static void topology_schedule_update(void)
1539{ 1539{
1540 schedule_work(&topology_work); 1540 schedule_work(&topology_work);
1541} 1541}