diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2018-08-10 13:38:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-08-15 18:16:55 +1000 |
| commit | a9d6859bd6b9aed3aa8d5a661d8e3ca75914a2d2 (patch) | |
| tree | bea076531aed657c9d5c4cc55b3dc2cb272366dd | |
| parent | c7c01e575d75a722edf8f33bac6c61eca3ab3086 (diff) | |
| download | linux-next-a9d6859bd6b9aed3aa8d5a661d8e3ca75914a2d2.tar.gz | |
resource-merge-resources-on-a-node-when-hot-adding-memory-fix
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | kernel/resource.c | 2 | ||||
| -rw-r--r-- | mm/memory_hotplug.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index a31d3f5bccb7..a5227f98d213 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1625,7 +1625,7 @@ __setup("iomem=", strict_iomem); #ifdef CONFIG_MEMORY_HOTPLUG #ifdef CONFIG_MEMORY_HOTREMOVE /* - * Attempt to merge resource and it's sibling + * Attempt to merge resource and its sibling */ static int merge_resources(struct resource *res) { diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 5d50057e7716..6a2726920ed2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1116,7 +1116,7 @@ static int online_memory_block(struct memory_block *mem, void *arg) } /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ -int __ref add_memory_resource(int nid, struct resource *res, bool online) +int __ref add_memory_resource(int nid, u64 start, u64 size, bool online) { bool new_node = false; int ret; |