diff options
Diffstat (limited to 'mm/memory_hotplug.c')
-rw-r--r-- | mm/memory_hotplug.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index f13783e81eb6..ea4038838b0a 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -256,9 +256,19 @@ int add_memory(int nid, u64 start, u64 size) | |||
256 | if (ret < 0) | 256 | if (ret < 0) |
257 | goto error; | 257 | goto error; |
258 | 258 | ||
259 | /* we online node here. we have no error path from here. */ | 259 | /* we online node here. we can't roll back from here. */ |
260 | node_set_online(nid); | 260 | node_set_online(nid); |
261 | 261 | ||
262 | if (new_pgdat) { | ||
263 | ret = register_one_node(nid); | ||
264 | /* | ||
265 | * If sysfs file of new node can't create, cpu on the node | ||
266 | * can't be hot-added. There is no rollback way now. | ||
267 | * So, check by BUG_ON() to catch it reluctantly.. | ||
268 | */ | ||
269 | BUG_ON(ret); | ||
270 | } | ||
271 | |||
262 | /* register this memory as resource */ | 272 | /* register this memory as resource */ |
263 | register_memory_resource(start, size); | 273 | register_memory_resource(start, size); |
264 | 274 | ||