Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tracing: Have max_latency be defined for HWLAT_TRACER as well

The hwlat tracer uses tr->max_latency, and if it's the only tracer enabled
that uses it, the build will fail. Add max_latency and its file when the
hwlat tracer is enabled.

Link: http://lkml.kernel.org/r/d6c3b7eb-ba95-1ffa-0453-464e1e24262a@infradead.org

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

+5 -3
+3 -3
kernel/trace/trace.c
··· 4945 4945 return ret; 4946 4946 } 4947 4947 4948 - #ifdef CONFIG_TRACER_MAX_TRACE 4948 + #if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) 4949 4949 4950 4950 static ssize_t 4951 4951 tracing_max_lat_read(struct file *filp, char __user *ubuf, ··· 5867 5867 .llseek = generic_file_llseek, 5868 5868 }; 5869 5869 5870 - #ifdef CONFIG_TRACER_MAX_TRACE 5870 + #if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) 5871 5871 static const struct file_operations tracing_max_lat_fops = { 5872 5872 .open = tracing_open_generic, 5873 5873 .read = tracing_max_lat_read, ··· 7195 7195 7196 7196 create_trace_options_dir(tr); 7197 7197 7198 - #ifdef CONFIG_TRACER_MAX_TRACE 7198 + #if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) 7199 7199 trace_create_file("tracing_max_latency", 0644, d_tracer, 7200 7200 &tr->max_latency, &tracing_max_lat_fops); 7201 7201 #endif
+2
kernel/trace/trace.h
··· 214 214 */ 215 215 struct trace_buffer max_buffer; 216 216 bool allocated_snapshot; 217 + #endif 218 + #if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) 217 219 unsigned long max_latency; 218 220 #endif 219 221 struct trace_pid_list __rcu *filtered_pids;