Merge commit 'v2.6.36-rc3' into x86/memblock

Conflicts:
	arch/x86/kernel/trampoline.c
	mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 21 insertions, 12 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f2cd7450fa76..768ea486df58 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1739,7 +1739,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
         struct page *page;
 
         /* Acquire the OOM killer lock for the zones in zonelist */
-        if (!try_set_zone_oom(zonelist, gfp_mask)) {
+        if (!try_set_zonelist_oom(zonelist, gfp_mask)) {
                 schedule_timeout_uninterruptible(1);
                 return NULL;
         }
@@ -1760,6 +1760,9 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
                 /* The OOM killer will not help higher order allocs */
                 if (order > PAGE_ALLOC_COSTLY_ORDER)
                         goto out;
+                /* The OOM killer does not needlessly kill tasks for lowmem */
+                if (high_zoneidx < ZONE_NORMAL)
+                        goto out;
                 /*
                  * GFP_THISNODE contains __GFP_NORETRY and we never hit this.
                  * Sanity check for bare calls of __GFP_THISNODE, not real OOM.
@@ -2053,15 +2056,23 @@ rebalance:
                         if (page)
                                 goto got_pg;
 
-                        /*
-                         * The OOM killer does not trigger for high-order
-                         * ~__GFP_NOFAIL allocations so if no progress is being
-                         * made, there are no other options and retrying is
-                         * unlikely to help.
-                         */
-                        if (order > PAGE_ALLOC_COSTLY_ORDER &&
-                                                !(gfp_mask & __GFP_NOFAIL))
-                                goto nopage;
+                        if (!(gfp_mask & __GFP_NOFAIL)) {
+                                /*
+                                 * The oom killer is not called for high-order
+                                 * allocations that may fail, so if no progress
+                                 * is being made, there are no other options and
+                                 * retrying is unlikely to help.
+                                 */
+                                if (order > PAGE_ALLOC_COSTLY_ORDER)
+                                        goto nopage;
+                                /*
+                                 * The oom killer is not called for lowmem
+                                 * allocations to prevent needlessly killing
+                                 * innocent tasks.
+                                 */
+                                if (high_zoneidx < ZONE_NORMAL)
+                                        goto nopage;
+                        }
 
                         goto restart;
                 }
@@ -4105,8 +4116,6 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                 zone_seqlock_init(zone);
                 zone->zone_pgdat = pgdat;
 
-                zone->prev_priority = DEF_PRIORITY;
-
                 zone_pcp_init(zone);
                 for_each_lru(l) {
                         INIT_LIST_HEAD(&zone->lru[l].list);