summaryrefslogtreecommitdiff
path: root/include/trace
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2012-11-29 13:54:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-30 08:51:17 -0800
commita50915394f1fc02c2861d3b7ce7014788aa5066e (patch)
tree4b94679a29fb97db6b5163a4c1345d62dfa6a1e7 /include/trace
parent60cefed485a02bd99b6299dad70666fe49245da7 (diff)
downloadlinux-3.10-a50915394f1fc02c2861d3b7ce7014788aa5066e.tar.gz
linux-3.10-a50915394f1fc02c2861d3b7ce7014788aa5066e.tar.bz2
linux-3.10-a50915394f1fc02c2861d3b7ce7014788aa5066e.zip
revert "Revert "mm: remove __GFP_NO_KSWAPD""
It apepars that this patch was innocent, and we hope that "mm: avoid waking kswapd for THP allocations when compaction is deferred or contended" will fix the final kswapd-spinning cause. Cc: Zdenek Kabelac <zkabelac@redhat.com> Cc: Seth Jennings <sjenning@linux.vnet.ibm.com> Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> Cc: Jiri Slaby <jirislaby@gmail.com> Cc: Rik van Riel <riel@redhat.com> Cc: Robert Jennings <rcj@linux.vnet.ibm.com> Cc: Mel Gorman <mgorman@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/events/gfpflags.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/trace/events/gfpflags.h b/include/trace/events/gfpflags.h
index d6fd8e5b14b..9391706e925 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"