Merge 5.2 into android-common

Linux 5.2 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
2019-07-08 08:24:40 +02:00
parent 9bc25811e4 0ecfebd2b5
commit a4bbf3df04
81 changed files with 492 additions and 313 deletions
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1838,7 +1838,8 @@ deferred_grow_zone(struct zone *zone, unsigned int order)
 						 first_deferred_pfn)) {
 		pgdat->first_deferred_pfn = ULONG_MAX;
 		pgdat_resize_unlock(pgdat, &flags);
-		return true;
+		/* Retry only once. */
+		return first_deferred_pfn != ULONG_MAX;
 	}

 	/*