diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory_hotplug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 02159c755136..c46887b5a11e 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
| @@ -498,7 +498,9 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) | |||
| 498 | * The node we allocated has no zone fallback lists. For avoiding | 498 | * The node we allocated has no zone fallback lists. For avoiding |
| 499 | * to access not-initialized zonelist, build here. | 499 | * to access not-initialized zonelist, build here. |
| 500 | */ | 500 | */ |
| 501 | mutex_lock(&zonelists_mutex); | ||
| 501 | build_all_zonelists(NULL); | 502 | build_all_zonelists(NULL); |
| 503 | mutex_unlock(&zonelists_mutex); | ||
| 502 | 504 | ||
| 503 | return pgdat; | 505 | return pgdat; |
| 504 | } | 506 | } |
| @@ -521,7 +523,7 @@ int mem_online_node(int nid) | |||
| 521 | 523 | ||
| 522 | lock_memory_hotplug(); | 524 | lock_memory_hotplug(); |
| 523 | pgdat = hotadd_new_pgdat(nid, 0); | 525 | pgdat = hotadd_new_pgdat(nid, 0); |
| 524 | if (pgdat) { | 526 | if (!pgdat) { |
| 525 | ret = -ENOMEM; | 527 | ret = -ENOMEM; |
| 526 | goto out; | 528 | goto out; |
| 527 | } | 529 | } |
