Merge branch 'linus' into locking/core, to fix up conflicts

 Conflicts:
	mm/page_alloc.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 24 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 471b0526b876..9327a940e373 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -67,6 +67,7 @@
 #include <linux/memcontrol.h>
 #include <linux/ftrace.h>
 #include <linux/lockdep.h>
+#include <linux/nmi.h>
 
 #include <asm/sections.h>
 #include <asm/tlbflush.h>
@@ -2536,9 +2537,14 @@ void drain_all_pages(struct zone *zone)
 
 #ifdef CONFIG_HIBERNATION
 
+/*
+ * Touch the watchdog for every WD_PAGE_COUNT pages.
+ */
+#define WD_PAGE_COUNT   (128*1024)
+
 void mark_free_pages(struct zone *zone)
 {
-        unsigned long pfn, max_zone_pfn;
+        unsigned long pfn, max_zone_pfn, page_count = WD_PAGE_COUNT;
         unsigned long flags;
         unsigned int order, t;
         struct page *page;
@@ -2553,6 +2559,11 @@ void mark_free_pages(struct zone *zone)
                 if (pfn_valid(pfn)) {
                         page = pfn_to_page(pfn);
 
+                        if (!--page_count) {
+                                touch_nmi_watchdog();
+                                page_count = WD_PAGE_COUNT;
+                        }
+
                         if (page_zone(page) != zone)
                                 continue;
 
@@ -2566,8 +2577,13 @@ void mark_free_pages(struct zone *zone)
                         unsigned long i;
 
                         pfn = page_to_pfn(page);
-                        for (i = 0; i < (1UL << order); i++)
+                        for (i = 0; i < (1UL << order); i++) {
+                                if (!--page_count) {
+                                        touch_nmi_watchdog();
+                                        page_count = WD_PAGE_COUNT;
+                                }
                                 swsusp_set_page_free(pfn_to_page(pfn + i));
+                        }
                 }
         }
         spin_unlock_irqrestore(&zone->lock, flags);
@@ -3276,10 +3292,13 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
         /*
          * Go through the zonelist yet one more time, keep very high watermark
          * here, this is only to catch a parallel oom killing, we must fail if
-         * we're still under heavy pressure.
+         * we're still under heavy pressure. But make sure that this reclaim
+         * attempt shall not depend on __GFP_DIRECT_RECLAIM && !__GFP_NORETRY
+         * allocation which will never fail due to oom_lock already held.
          */
-        page = get_page_from_freelist(gfp_mask | __GFP_HARDWALL, order,
-                                        ALLOC_WMARK_HIGH|ALLOC_CPUSET, ac);
+        page = get_page_from_freelist((gfp_mask | __GFP_HARDWALL) &
+                                      ~__GFP_DIRECT_RECLAIM, order,
+                                      ALLOC_WMARK_HIGH|ALLOC_CPUSET, ac);
         if (page)
                 goto out;