Merge 5.9-rc2 into android-mainline
Linux 5.9-rc2 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I4dd4b70b085bfa0b5cb49ffa373c18cfe857bcf3
This commit is contained in:
@@ -1314,6 +1314,11 @@ static void free_pcppages_bulk(struct zone *zone, int count,
|
||||
struct page *page, *tmp;
|
||||
LIST_HEAD(head);
|
||||
|
||||
/*
|
||||
* Ensure proper count is passed which otherwise would stuck in the
|
||||
* below while (list_empty(list)) loop.
|
||||
*/
|
||||
count = min(pcp->count, count);
|
||||
while (count) {
|
||||
struct list_head *list;
|
||||
|
||||
@@ -7903,7 +7908,7 @@ int __meminit init_per_zone_wmark_min(void)
|
||||
|
||||
return 0;
|
||||
}
|
||||
core_initcall(init_per_zone_wmark_min)
|
||||
postcore_initcall(init_per_zone_wmark_min)
|
||||
|
||||
/*
|
||||
* min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so
|
||||
|
||||
Reference in New Issue
Block a user