diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 19:59:18 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 19:59:18 +0100 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /mm/memory_hotplug.c | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) | |
| download | linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.gz linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.bz2 linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1fe76d963ac2..1ae2b2cc3a54 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -69,12 +69,16 @@ int __add_pages(struct zone *zone, unsigned long phys_start_pfn, for (i = 0; i < nr_pages; i += PAGES_PER_SECTION) { err = __add_section(zone, phys_start_pfn + i); - if (err) + /* We want to keep adding the rest of the + * sections if the first ones already exist + */ + if (err && (err != -EEXIST)) break; } return err; } +EXPORT_SYMBOL_GPL(__add_pages); static void grow_zone_span(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn) |