Skip to content

Commit 185194f

Browse files
Vasily Averinakpm00
Vasily Averin
authored and
akpm00
committed
include/trace/events/mmflags.h: cleanup for "tracing: incorrect gfp_t conversion"
Redefines __def_gfpflag_names array according to akpm@, willy@ and Joe Perches recommendations. Link: https://lkml.kernel.org/r/6f811e19-41c6-f3e8-fca6-23a19a62e313@openvz.org Fixes: fe57332 ("tracing: incorrect gfp_t conversion") Signed-off-by: Vasily Averin <vvs@openvz.org> Cc: Matthew Wilcox <willy@infradead.org> Cc: Joe Perches <joe@perches.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 88ee134 commit 185194f

1 file changed

Lines changed: 43 additions & 41 deletions

File tree

‎include/trace/events/mmflags.h‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,51 @@
1313
* Thus most bits set go first.
1414
*/
1515

16-
#define __def_gfpflag_names \
17-
{(__force unsigned long)GFP_TRANSHUGE, "GFP_TRANSHUGE"}, \
18-
{(__force unsigned long)GFP_TRANSHUGE_LIGHT, "GFP_TRANSHUGE_LIGHT"}, \
19-
{(__force unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE"},\
20-
{(__force unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER"}, \
21-
{(__force unsigned long)GFP_USER, "GFP_USER"}, \
22-
{(__force unsigned long)GFP_KERNEL_ACCOUNT, "GFP_KERNEL_ACCOUNT"}, \
23-
{(__force unsigned long)GFP_KERNEL, "GFP_KERNEL"}, \
24-
{(__force unsigned long)GFP_NOFS, "GFP_NOFS"}, \
25-
{(__force unsigned long)GFP_ATOMIC, "GFP_ATOMIC"}, \
26-
{(__force unsigned long)GFP_NOIO, "GFP_NOIO"}, \
27-
{(__force unsigned long)GFP_NOWAIT, "GFP_NOWAIT"}, \
28-
{(__force unsigned long)GFP_DMA, "GFP_DMA"}, \
29-
{(__force unsigned long)__GFP_HIGHMEM, "__GFP_HIGHMEM"}, \
30-
{(__force unsigned long)GFP_DMA32, "GFP_DMA32"}, \
31-
{(__force unsigned long)__GFP_HIGH, "__GFP_HIGH"}, \
32-
{(__force unsigned long)__GFP_ATOMIC, "__GFP_ATOMIC"}, \
33-
{(__force unsigned long)__GFP_IO, "__GFP_IO"}, \
34-
{(__force unsigned long)__GFP_FS, "__GFP_FS"}, \
35-
{(__force unsigned long)__GFP_NOWARN, "__GFP_NOWARN"}, \
36-
{(__force unsigned long)__GFP_RETRY_MAYFAIL, "__GFP_RETRY_MAYFAIL"}, \
37-
{(__force unsigned long)__GFP_NOFAIL, "__GFP_NOFAIL"}, \
38-
{(__force unsigned long)__GFP_NORETRY, "__GFP_NORETRY"}, \
39-
{(__force unsigned long)__GFP_COMP, "__GFP_COMP"}, \
40-
{(__force unsigned long)__GFP_ZERO, "__GFP_ZERO"}, \
41-
{(__force unsigned long)__GFP_NOMEMALLOC, "__GFP_NOMEMALLOC"}, \
42-
{(__force unsigned long)__GFP_MEMALLOC, "__GFP_MEMALLOC"}, \
43-
{(__force unsigned long)__GFP_HARDWALL, "__GFP_HARDWALL"}, \
44-
{(__force unsigned long)__GFP_THISNODE, "__GFP_THISNODE"}, \
45-
{(__force unsigned long)__GFP_RECLAIMABLE, "__GFP_RECLAIMABLE"}, \
46-
{(__force unsigned long)__GFP_MOVABLE, "__GFP_MOVABLE"}, \
47-
{(__force unsigned long)__GFP_ACCOUNT, "__GFP_ACCOUNT"}, \
48-
{(__force unsigned long)__GFP_WRITE, "__GFP_WRITE"}, \
49-
{(__force unsigned long)__GFP_RECLAIM, "__GFP_RECLAIM"}, \
50-
{(__force unsigned long)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"},\
51-
{(__force unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"},\
52-
{(__force unsigned long)__GFP_ZEROTAGS, "__GFP_ZEROTAGS"} \
16+
#define gfpflag_string(flag) {(__force unsigned long)flag, #flag}
17+
18+
#define __def_gfpflag_names \
19+
gfpflag_string(GFP_TRANSHUGE), \
20+
gfpflag_string(GFP_TRANSHUGE_LIGHT), \
21+
gfpflag_string(GFP_HIGHUSER_MOVABLE), \
22+
gfpflag_string(GFP_HIGHUSER), \
23+
gfpflag_string(GFP_USER), \
24+
gfpflag_string(GFP_KERNEL_ACCOUNT), \
25+
gfpflag_string(GFP_KERNEL), \
26+
gfpflag_string(GFP_NOFS), \
27+
gfpflag_string(GFP_ATOMIC), \
28+
gfpflag_string(GFP_NOIO), \
29+
gfpflag_string(GFP_NOWAIT), \
30+
gfpflag_string(GFP_DMA), \
31+
gfpflag_string(__GFP_HIGHMEM), \
32+
gfpflag_string(GFP_DMA32), \
33+
gfpflag_string(__GFP_HIGH), \
34+
gfpflag_string(__GFP_ATOMIC), \
35+
gfpflag_string(__GFP_IO), \
36+
gfpflag_string(__GFP_FS), \
37+
gfpflag_string(__GFP_NOWARN), \
38+
gfpflag_string(__GFP_RETRY_MAYFAIL), \
39+
gfpflag_string(__GFP_NOFAIL), \
40+
gfpflag_string(__GFP_NORETRY), \
41+
gfpflag_string(__GFP_COMP), \
42+
gfpflag_string(__GFP_ZERO), \
43+
gfpflag_string(__GFP_NOMEMALLOC), \
44+
gfpflag_string(__GFP_MEMALLOC), \
45+
gfpflag_string(__GFP_HARDWALL), \
46+
gfpflag_string(__GFP_THISNODE), \
47+
gfpflag_string(__GFP_RECLAIMABLE), \
48+
gfpflag_string(__GFP_MOVABLE), \
49+
gfpflag_string(__GFP_ACCOUNT), \
50+
gfpflag_string(__GFP_WRITE), \
51+
gfpflag_string(__GFP_RECLAIM), \
52+
gfpflag_string(__GFP_DIRECT_RECLAIM), \
53+
gfpflag_string(__GFP_KSWAPD_RECLAIM), \
54+
gfpflag_string(__GFP_ZEROTAGS)
5355

5456
#ifdef CONFIG_KASAN_HW_TAGS
55-
#define __def_gfpflag_names_kasan , \
56-
{(__force unsigned long)__GFP_SKIP_ZERO, "__GFP_SKIP_ZERO"}, \
57-
{(__force unsigned long)__GFP_SKIP_KASAN_POISON, "__GFP_SKIP_KASAN_POISON"}, \
58-
{(__force unsigned long)__GFP_SKIP_KASAN_UNPOISON, "__GFP_SKIP_KASAN_UNPOISON"}
57+
#define __def_gfpflag_names_kasan , \
58+
gfpflag_string(__GFP_SKIP_ZERO), \
59+
gfpflag_string(__GFP_SKIP_KASAN_POISON), \
60+
gfpflag_string(__GFP_SKIP_KASAN_UNPOISON)
5961
#else
6062
#define __def_gfpflag_names_kasan
6163
#endif

0 commit comments

Comments
 (0)