xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.3-rc6 into android-mainline

Browse Source 
Linux 5.3-rc6

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id10580d48d56054408b3efe0bd1866d67aba2a3d
This commit is contained in:
Greg Kroah-Hartman
2019-08-26 16:45:30 +02:00
parent a5bd47ef3f a55aa89aab
commit ad455d87e5
304 changed files with 2935 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mm/page_alloc.c
View File

@@ -2250,27 +2250,12 @@ static int move_freepages(struct zone *zone,
unsigned int order;
int pages_moved = 0;
#ifndef CONFIG_HOLES_IN_ZONE
/*
* page_zone is not safe to call in this context when
* CONFIG_HOLES_IN_ZONE is set. This bug check is probably redundant
* anyway as we check zone boundaries in move_freepages_block().
* Remove at a later date when no bug reports exist related to
* grouping pages by mobility
*/
VM_BUG_ON(pfn_valid(page_to_pfn(start_page)) &&
pfn_valid(page_to_pfn(end_page)) &&
page_zone(start_page) != page_zone(end_page));
#endif
for (page = start_page; page <= end_page;) {
if (!pfn_valid_within(page_to_pfn(page))) {
page++;
continue;
}
/* Make sure we are not inadvertently changing nodes */
VM_BUG_ON_PAGE(page_to_nid(page) != zone_to_nid(zone), page);
if (!PageBuddy(page)) {
/*
* We assume that pages that could be isolated for
@@ -2285,6 +2270,10 @@ static int move_freepages(struct zone *zone,
continue;
}
/* Make sure we are not inadvertently changing nodes */
VM_BUG_ON_PAGE(page_to_nid(page) != zone_to_nid(zone), page);
VM_BUG_ON_PAGE(page_zone(page) != zone, page);
order = page_order(page);
move_to_free_area(page, &zone->free_area[order], migratetype);
page += 1 << order;