|
@@ -1107,17 +1107,18 @@ int __ref add_memory(int nid, u64 start, u64 size)
|
|
if (ret)
|
|
if (ret)
|
|
return ret;
|
|
return ret;
|
|
|
|
|
|
- lock_memory_hotplug();
|
|
|
|
-
|
|
|
|
res = register_memory_resource(start, size);
|
|
res = register_memory_resource(start, size);
|
|
ret = -EEXIST;
|
|
ret = -EEXIST;
|
|
if (!res)
|
|
if (!res)
|
|
- goto out;
|
|
|
|
|
|
+ return ret;
|
|
|
|
|
|
{ /* Stupid hack to suppress address-never-null warning */
|
|
{ /* Stupid hack to suppress address-never-null warning */
|
|
void *p = NODE_DATA(nid);
|
|
void *p = NODE_DATA(nid);
|
|
new_pgdat = !p;
|
|
new_pgdat = !p;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ lock_memory_hotplug();
|
|
|
|
+
|
|
new_node = !node_online(nid);
|
|
new_node = !node_online(nid);
|
|
if (new_node) {
|
|
if (new_node) {
|
|
pgdat = hotadd_new_pgdat(nid, start);
|
|
pgdat = hotadd_new_pgdat(nid, start);
|