diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-11 20:43:39 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-11 20:43:39 +0100 |
| commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
| tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /include/trace | |
| parent | Merge branch 'cls_flower-ARP' (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.xz linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/mmflags.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h index 9e687ca9a307..15bf875d0e4a 100644 --- a/include/trace/events/mmflags.h +++ b/include/trace/events/mmflags.h @@ -47,8 +47,7 @@ {(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_OTHER_NODE, "__GFP_OTHER_NODE"} \ + {(unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"}\ #define show_gfp_flags(flags) \ (flags) ? __print_flags(flags, "|", \ |