Merge branch 'linus' into tracing/kmemtrace2

[~andy/linux] / kernel / trace / trace.h

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 534505bb39b0b3d21bf65d3fbd49863e96844c82..742fe134927692649b81eaa8c087e8f14a2dd575 100644 (file)
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -393,7 +393,7 @@ struct trace_iterator {
        loff_t                  pos;
        long                    idx;
 
-       cpumask_t               started;
+       cpumask_var_t           started;
 };
 
 int tracing_is_enabled(void);