diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-07 01:37:06 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-07 01:37:06 +0300 |
| commit | d0300e5e8d2fb74852f8116f26546e12cfa66735 (patch) | |
| tree | a6580aa74a0ebd7965dbc37767717b4f73dd9d79 /include/linux/ring_buffer.h | |
| parent | c32909741fe93032705e6da29b564b8fec84f415 (diff) | |
| parent | 34c9ca37aaec2e307b837bb099d3b44f0ea04ddc (diff) | |
| download | linux-d0300e5e8d2fb74852f8116f26546e12cfa66735.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh to v4.15
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ring_buffer.h')
| -rw-r--r-- | include/linux/ring_buffer.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index fa6ace66fea5..289e4d54e3e0 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -2,7 +2,6 @@ #ifndef _LINUX_RING_BUFFER_H #define _LINUX_RING_BUFFER_H -#include <linux/kmemcheck.h> #include <linux/mm.h> #include <linux/seq_file.h> #include <linux/poll.h> @@ -14,9 +13,7 @@ struct ring_buffer_iter; * Don't refer to this struct directly, use functions below. */ struct ring_buffer_event { - kmemcheck_bitfield_begin(bitfield); u32 type_len:5, time_delta:27; - kmemcheck_bitfield_end(bitfield); u32 array[]; }; |