When updating tracing's show_gfp_flags() I have noticed that perf's gfp_compact_table is also outdated. Fill in the missing flags and place a note in gfp.h to increase chance that future updates are synced.
Signed-off-by: Vlastimil Babka <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Rasmus Villemoes <[email protected]> Cc: Joonsoo Kim <[email protected]> Cc: Minchan Kim <[email protected]> Cc: Sasha Levin <[email protected]> Cc: "Kirill A. Shutemov" <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Michal Hocko <[email protected]> --- include/linux/gfp.h | 2 +- tools/perf/builtin-kmem.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 6ffee7f93af7..eed323f58547 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -11,7 +11,7 @@ struct vm_area_struct; /* * In case of changes, please don't forget to update - * include/trace/events/gfpflags.h + * include/trace/events/gfpflags.h and tools/perf/builtin-kmem.c */ /* Plain integer GFP bitmasks. Do not use this directly. */ diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 93ce665f976f..acb0d011803a 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -616,9 +616,13 @@ static const struct { { "GFP_NOFS", "NF" }, { "GFP_ATOMIC", "A" }, { "GFP_NOIO", "NI" }, + { "GFP_NOWAIT", "NW" }, + { "GFP_DMA", "D" }, + { "GFP_DMA32", "D32" }, { "GFP_HIGH", "H" }, - { "GFP_WAIT", "W" }, + { "__GFP_ATOMIC", "_A" }, { "GFP_IO", "I" }, + { "GFP_FS", "F" }, { "GFP_COLD", "CO" }, { "GFP_NOWARN", "NWR" }, { "GFP_REPEAT", "R" }, @@ -633,9 +637,10 @@ static const struct { { "GFP_RECLAIMABLE", "RC" }, { "GFP_MOVABLE", "M" }, { "GFP_NOTRACK", "NT" }, - { "GFP_NO_KSWAPD", "NK" }, + { "GFP_WRITE", "WR" }, + { "GFP_DIRECT_RECLAIM", "DR" }, + { "GFP_KSWAPD_RECLAIM", "KR" }, { "GFP_OTHER_NODE", "ON" }, - { "GFP_NOWAIT", "NW" }, }; static size_t max_gfp_len; -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
