Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c841af88836a..77e4d3c5c57b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1190,7 +1190,7 @@ static void __meminit __init_single_pfn(unsigned long pfn, unsigned long zone,
 }
 
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
-static void init_reserved_page(unsigned long pfn)
+static void __meminit init_reserved_page(unsigned long pfn)
 {
         pg_data_t *pgdat;
         int nid, zid;
@@ -5367,6 +5367,7 @@ not_early:
 
                         __init_single_page(page, pfn, zone, nid);
                         set_pageblock_migratetype(page, MIGRATE_MOVABLE);
+                        cond_resched();
                 } else {
                         __init_single_pfn(pfn, zone, nid);
                 }