summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-09-29 18:13:33 -0400
committerSteven Rostedt <rostedt@goodmis.org>2015-09-30 04:35:18 -0400
commitb5e87c0581319481399b6d8e8d6972b5523c18e6 (patch)
tree4439fbdae48bb3dbd6b8023c25be9c618da1c11e /kernel
parent41d9c0beccbb92397bea8b04a6afd1253c064a1a (diff)
tracing: Add build bug if we have more trace_flags than bits
Add a enum that denotes the last bit of the trace_flags and have a BUILD_BUG_ON(last_bit > 32). If we add more bits than we have in trace_flags, the kernel wont build. Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c6
-rw-r--r--kernel/trace/trace.h6
2 files changed, 11 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7446d4238f87..991bab9b79d2 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7046,6 +7046,12 @@ __init static int tracer_alloc_buffers(void)
7046 int ring_buf_size; 7046 int ring_buf_size;
7047 int ret = -ENOMEM; 7047 int ret = -ENOMEM;
7048 7048
7049 /*
7050 * Make sure we don't accidently add more trace options
7051 * than we have bits for.
7052 */
7053 BUILD_BUG_ON(TRACE_ITER_LAST_BIT > 32);
7054
7049 if (!alloc_cpumask_var(&tracing_buffer_mask, GFP_KERNEL)) 7055 if (!alloc_cpumask_var(&tracing_buffer_mask, GFP_KERNEL))
7050 goto out; 7056 goto out;
7051 7057
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 8ed97872b65b..07155652254d 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -966,7 +966,11 @@ extern int trace_get_user(struct trace_parser *parser, const char __user *ubuf,
966#undef C 966#undef C
967#define C(a, b) TRACE_ITER_##a##_BIT 967#define C(a, b) TRACE_ITER_##a##_BIT
968 968
969enum trace_iterator_bits { TRACE_FLAGS }; 969enum trace_iterator_bits {
970 TRACE_FLAGS
971 /* Make sure we don't go more than we have bits for */
972 TRACE_ITER_LAST_BIT
973};
970 974
971/* 975/*
972 * By redefining C, we can make TRACE_FLAGS a list of masks that 976 * By redefining C, we can make TRACE_FLAGS a list of masks that