[for-next][PATCH] tracing: #ifdef out uses of max trace when CONFIG_TRACER_MAX_TRACE is not set

[Steven Rostedt]

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: e428abbbf616cd8fdd1162e4a624ad1d47b47544


Chen Gang (1):
      tracing: #ifdef out uses of max trace when CONFIG_TRACER_MAX_TRACE is not set

----
 kernel/trace/trace.c | 6 ++++++
 1 file changed, 6 insertions(+)
---------------------------
commit e428abbbf616cd8fdd1162e4a624ad1d47b47544
Author: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
Date:   Tue Nov 10 05:15:15 2015 +0800

    tracing: #ifdef out uses of max trace when CONFIG_TRACER_MAX_TRACE is not set
    
    tracing_max_lat_fops is used only when TRACER_MAX_TRACE enabled, so also
    swith the related code. The related warning with defconfig under x86_64:
    
        CC      kernel/trace/trace.o
      kernel/trace/trace.c:5466:37: warning: âtracing_max_lat_fopsâ defined but not used [-Wunused-const-variable]
       static const struct file_operations tracing_max_lat_fops = {
    
    Signed-off-by: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index b11582618991..87fb9801bd9e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4548,6 +4548,8 @@ out:
 	return ret;
 }
 
+#ifdef CONFIG_TRACER_MAX_TRACE
+
 static ssize_t
 tracing_max_lat_read(struct file *filp, char __user *ubuf,
 		     size_t cnt, loff_t *ppos)
@@ -4562,6 +4564,8 @@ tracing_max_lat_write(struct file *filp, const char __user *ubuf,
 	return tracing_nsecs_write(filp->private_data, ubuf, cnt, ppos);
 }
 
+#endif
+
 static int tracing_open_pipe(struct inode *inode, struct file *filp)
 {
 	struct trace_array *tr = inode->i_private;
@@ -5463,12 +5467,14 @@ static const struct file_operations tracing_thresh_fops = {
 	.llseek		= generic_file_llseek,
 };
 
+#ifdef CONFIG_TRACER_MAX_TRACE
 static const struct file_operations tracing_max_lat_fops = {
 	.open		= tracing_open_generic,
 	.read		= tracing_max_lat_read,
 	.write		= tracing_max_lat_write,
 	.llseek		= generic_file_llseek,
 };
+#endif
 
 static const struct file_operations set_tracer_fops = {
 	.open		= tracing_open_generic,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/