From b6beae2c2014d78fb3d47e215a0655939107edfc Mon Sep 17 00:00:00 2001 From: Rik van Riel Date: Tue, 14 Aug 2012 13:22:33 +1000 Subject: [PATCH] mm: remove __GFP_NO_KSWAPD fixes Turns out I missed two spots where __GFP_NO_KSWAPD is used. The removal from the trace code is obvious, since the flag got removed there is no need to print it. For mtdcore.c, now that memory compaction has been fixed, we should no longer see large swap storms from an attempt to allocate a large buffer, removing the need to specify __GFP_NO_KSWAPD. Signed-off-by: Rik van Riel Cc: Andrea Arcangeli Cc: Mel Gorman Cc: Artem Bityutskiy Cc: David Woodhouse Cc: Minchan Kim Signed-off-by: Andrew Morton --- drivers/mtd/mtdcore.c | 3 +-- include/trace/events/gfpflags.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index ec794a72975d..15c4cfc2c13f 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -1092,8 +1092,7 @@ EXPORT_SYMBOL_GPL(mtd_writev); */ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size) { - gfp_t flags = __GFP_NOWARN | __GFP_WAIT | - __GFP_NORETRY | __GFP_NO_KSWAPD; + gfp_t flags = __GFP_NOWARN | __GFP_WAIT | __GFP_NORETRY; size_t min_alloc = max_t(size_t, mtd->writesize, PAGE_SIZE); void *kbuf; diff --git a/include/trace/events/gfpflags.h b/include/trace/events/gfpflags.h index d6fd8e5b14b7..9391706e9254 100644 --- a/include/trace/events/gfpflags.h +++ b/include/trace/events/gfpflags.h @@ -36,7 +36,6 @@ {(unsigned long)__GFP_RECLAIMABLE, "GFP_RECLAIMABLE"}, \ {(unsigned long)__GFP_MOVABLE, "GFP_MOVABLE"}, \ {(unsigned long)__GFP_NOTRACK, "GFP_NOTRACK"}, \ - {(unsigned long)__GFP_NO_KSWAPD, "GFP_NO_KSWAPD"}, \ {(unsigned long)__GFP_OTHER_NODE, "GFP_OTHER_NODE"} \ ) : "GFP_NOWAIT" -- 2.39.2