2 files changed, 4 insertions, 23 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 2e53e6f09440..55fcbb567950 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -299,6 +299,7 @@ static const char *trace_options[] = {
         "sym-userobj",
         "printk-msg-only",
         "context-info",
+        "latency-format",
         NULL
 };
 
@@ -1829,26 +1830,12 @@ static int tracing_open(struct inode *inode, struct file *file)
         iter = __tracing_open(inode, file);
         if (IS_ERR(iter))
                 ret = PTR_ERR(iter);
-
-        return ret;
-}
-
-static int tracing_lt_open(struct inode *inode, struct file *file)
-{
-        struct trace_iterator *iter;
-        int ret = 0;
-
-        iter = __tracing_open(inode, file);
-
-        if (IS_ERR(iter))
-                ret = PTR_ERR(iter);
-        else
+        else if (trace_flags & TRACE_ITER_LATENCY_FMT)
                 iter->iter_flags |= TRACE_FILE_LAT_FMT;
 
         return ret;
 }
 
-
 static void *
 t_next(struct seq_file *m, void *v, loff_t *pos)
 {
@@ -1927,13 +1914,6 @@ static struct file_operations tracing_fops = {
         .release        = tracing_release,
 };
 
-static struct file_operations tracing_lt_fops = {
-        .open           = tracing_lt_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = tracing_release,
-};
-
 static struct file_operations show_traces_fops = {
         .open           = show_traces_open,
         .read           = seq_read,
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 561bb5c5d988..12cd119cca32 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -651,7 +651,8 @@ enum trace_iterator_flags {
         TRACE_ITER_USERSTACKTRACE       = 0x4000,
         TRACE_ITER_SYM_USEROBJ          = 0x8000,
         TRACE_ITER_PRINTK_MSGONLY       = 0x10000,
-        TRACE_ITER_CONTEXT_INFO         = 0x20000 /* Print pid/cpu/time */
+        TRACE_ITER_CONTEXT_INFO         = 0x20000, /* Print pid/cpu/time */
+        TRACE_ITER_LATENCY_FMT          = 0x40000,
 };
 
 /*