diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-26 23:45:47 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-27 03:57:57 +0300 |
| commit | 97c78d0af55fff206947a5f2b85b690b5acf28ce (patch) | |
| tree | 9799b7594e0f4429919882a684d36ba649e0408b /include/trace | |
| parent | deecae7d96843fceebae06445b3f4bf8cceca31a (diff) | |
| parent | 73367f05b25dbd064061aee780638564d15b01d1 (diff) | |
| download | linux-97c78d0af55fff206947a5f2b85b690b5acf28ce.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/wwan/mhi_wwan_mbim.c - drop the extra arg.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/mmflags.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 390270e00a1d..f160484afc5c 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -48,7 +48,9 @@ {(unsigned long)__GFP_WRITE, "__GFP_WRITE"}, \ {(unsigned long)__GFP_RECLAIM, "__GFP_RECLAIM"}, \ {(unsigned long)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"},\ - {(unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"}\ + {(unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"},\ + {(unsigned long)__GFP_ZEROTAGS, "__GFP_ZEROTAGS"}, \ + {(unsigned long)__GFP_SKIP_KASAN_POISON,"__GFP_SKIP_KASAN_POISON"}\ #define show_gfp_flags(flags) \ (flags) ? __print_flags(flags, "|", \ |