GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 06:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm/page_alloc: refactor out __alloc_contig_migrate_alloc()

Browse source 
__alloc_contig_migrate_alloc() can be used by memory-hotplug so refactor
it out (move + rename as a common name) into page_isolation.c.

[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: Minchan Kim <minchan@kernel.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Minchan Kim 2012-10-08 16:32:52 -07:00 • committed by Linus Torvalds
parent 3f6d4caeb9
commit 723a0644a7
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/page-isolation.h
View file

@ -41,6 +41,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn);
*/ */
int set_migratetype_isolate(struct page *page); int set_migratetype_isolate(struct page *page);
void unset_migratetype_isolate(struct page *page, unsigned migratetype); void unset_migratetype_isolate(struct page *page, unsigned migratetype);
struct page *alloc_migrate_target(struct page *page, unsigned long private,
int **resultp);
#endif #endif

14
mm/page_alloc.c
View file

@ -5667,18 +5667,6 @@ static unsigned long pfn_max_align_up(unsigned long pfn)
pageblock_nr_pages)); pageblock_nr_pages));
} }
static struct page *
__alloc_contig_migrate_alloc(struct page *page, unsigned long private,
int **resultp)
{
gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE;
if (PageHighMem(page))
gfp_mask |= __GFP_HIGHMEM;
return alloc_page(gfp_mask);
}
/* [start, end) must belong to a single zone. */ /* [start, end) must belong to a single zone. */
static int __alloc_contig_migrate_range(struct compact_control *cc, static int __alloc_contig_migrate_range(struct compact_control *cc,
unsigned long start, unsigned long end) unsigned long start, unsigned long end)
@ -5714,7 +5702,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc,
reclaim_clean_pages_from_list(cc->zone, &cc->migratepages); reclaim_clean_pages_from_list(cc->zone, &cc->migratepages);
ret = migrate_pages(&cc->migratepages, ret = migrate_pages(&cc->migratepages,
__alloc_contig_migrate_alloc, alloc_migrate_target,
0, false, MIGRATE_SYNC); 0, false, MIGRATE_SYNC);
} }

11
mm/page_isolation.c
View file

@ -255,3 +255,14 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
spin_unlock_irqrestore(&zone->lock, flags); spin_unlock_irqrestore(&zone->lock, flags);
return ret ? 0 : -EBUSY; return ret ? 0 : -EBUSY;
} }
struct page *alloc_migrate_target(struct page *page, unsigned long private,
int **resultp)
{
gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE;
if (PageHighMem(page))
gfp_mask |= __GFP_HIGHMEM;
return alloc_page(gfp_mask);
}