[folded-merged] mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures-fix
has been removed from the -mm tree.  Its filename was
     mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures-fix.patch

This patch was dropped because it was folded into mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures.patch

------------------------------------------------------
From: Michal Hocko <mhocko@xxxxxxxxxx>
Subject: mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures-fix

Dohh, forgot to git add the follow up fix on top of Johannes' original
diff so it didn't make it into the finall commit. Could you fold this
into the patch Andrew, please?

Sorry about that.
Link: http://lkml.kernel.org/r/20171107090635.c27thtse2lchjgvb@xxxxxxxxxxxxxx
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/sparse-vmemmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/sparse-vmemmap.c~mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures-fix mm/sparse-vmemmap.c
--- a/mm/sparse-vmemmap.c~mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures-fix
+++ a/mm/sparse-vmemmap.c
@@ -63,7 +63,7 @@ void * __meminit vmemmap_alloc_block(uns
 			return page_address(page);
 
 		if (!warned) {
-			warn_alloc(gfp_mask, NULL,
+			warn_alloc(gfp_mask & ~__GFP_NOWARN, NULL,
 				   "vmemmap alloc failure: order:%u", order);
 			warned = true;
 		}
_

Patches currently in -mm which might be from mhocko@xxxxxxxxxx are

mm-sparse-do-not-swamp-log-with-huge-vmemmap-allocation-failures.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux