git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[pandora-kernel.git]
/
mm
/
memory_hotplug.c
diff --git
a/mm/memory_hotplug.c
b/mm/memory_hotplug.c
index
fd678a6
..
df9d554
100644
(file)
--- a/
mm/memory_hotplug.c
+++ b/
mm/memory_hotplug.c
@@
-65,14
+65,15
@@
static int __add_zone(struct zone *zone, unsigned long phys_start_pfn)
int zone_type;
zone_type = zone - pgdat->node_zones;
int zone_type;
zone_type = zone - pgdat->node_zones;
- if (!
populated_zone(zone)
) {
+ if (!
zone->wait_table
) {
int ret = 0;
int ret = 0;
- ret = init_currently_empty_zone(zone, phys_start_pfn, nr_pages);
+ ret = init_currently_empty_zone(zone, phys_start_pfn,
+ nr_pages, MEMMAP_HOTPLUG);
if (ret < 0)
return ret;
}
if (ret < 0)
return ret;
}
- memmap_init_zone(nr_pages, nid, zone_type,
phys_start_pfn);
-
zonetable_add(zone, nid, zone_type, phys_start_pfn, nr_pages
);
+ memmap_init_zone(nr_pages, nid, zone_type,
+
phys_start_pfn, MEMMAP_HOTPLUG
);
return 0;
}
return 0;
}