diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-20 02:05:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-20 02:05:24 +0100 |
| commit | c78a85a8430e35aecd53e190a2f6b999062b1037 (patch) | |
| tree | fbd69827579db437492fb77b5faa53814114bed3 /include/trace/events/kmem.h | |
| parent | sctp: fix copying more bytes than expected in sctp_add_bind_addr (diff) | |
| parent | Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm (diff) | |
| download | linux-c78a85a8430e35aecd53e190a2f6b999062b1037.tar.xz linux-c78a85a8430e35aecd53e190a2f6b999062b1037.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'include/trace/events/kmem.h')
| -rw-r--r-- | include/trace/events/kmem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index f7554fd7fc62..ca7217389067 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -6,7 +6,7 @@ #include <linux/types.h> #include <linux/tracepoint.h> -#include <trace/events/gfpflags.h> +#include <trace/events/mmflags.h> DECLARE_EVENT_CLASS(kmem_alloc, |