| Message ID | 1405670163-53747-3-git-send-email-wangnan0@huawei.com |
|---|---|
| State | New |
| Headers | show |
On 2014/7/18 15:56, Wang Nan wrote: > This patch add new memory to ZONE_MOVABLE if movable zone is setup > and lower than newly added memory for x86_32. > > Signed-off-by: Wang Nan <wangnan0@huawei.com> > --- > arch/x86/mm/init_32.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index e395048..dd69833 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -826,9 +826,15 @@ int arch_add_memory(int nid, u64 start, u64 size) > { > struct pglist_data *pgdata = NODE_DATA(nid); > struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; > + struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; Sorry. pgdat should be pgdata. > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > > + if (!zone_is_empty(movable_zone)) > + if (zone_spans_pfn(movable_zone, start_pfn) || > + (zone_end_pfn(movable_zone) <= start_pfn)) > + zone = movable_zone; > + > return __add_pages(nid, zone, start_pfn, nr_pages); > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index e395048..dd69833 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -826,9 +826,15 @@ int arch_add_memory(int nid, u64 start, u64 size) { struct pglist_data *pgdata = NODE_DATA(nid); struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; + struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; + if (!zone_is_empty(movable_zone)) + if (zone_spans_pfn(movable_zone, start_pfn) || + (zone_end_pfn(movable_zone) <= start_pfn)) + zone = movable_zone; + return __add_pages(nid, zone, start_pfn, nr_pages); }
This patch add new memory to ZONE_MOVABLE if movable zone is setup and lower than newly added memory for x86_32. Signed-off-by: Wang Nan <wangnan0@huawei.com> --- arch/x86/mm/init_32.c | 6 ++++++ 1 file changed, 6 insertions(+)