Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

diff --combined kernel/trace/trace.c
index c380612273bf75d683ddebcf5e7863b30bece806,21db0deb5c7d3edb225534e3908e02801fb0dea4..f8cf959bad456dead3a5dec2fdd1a21e384f22bb
--- 1/kernel/trace/trace.c
--- 2/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -17,6 -17,7 +17,6 @@@
  #include <linux/writeback.h>
  #include <linux/kallsyms.h>
  #include <linux/seq_file.h>
 -#include <linux/smp_lock.h>
  #include <linux/notifier.h>
  #include <linux/irqflags.h>
  #include <linux/debugfs.h>
@@@ -2338,11 -2339,19 +2338,19 @@@ tracing_write_stub(struct file *filp, c
        return count;
  }
  
+ static loff_t tracing_seek(struct file *file, loff_t offset, int origin)
+ {
+       if (file->f_mode & FMODE_READ)
+               return seq_lseek(file, offset, origin);
+       else
+               return 0;
+ }
+ 
  static const struct file_operations tracing_fops = {
        .open           = tracing_open,
        .read           = seq_read,
        .write          = tracing_write_stub,
-       .llseek         = seq_lseek,
+       .llseek         = tracing_seek,
        .release        = tracing_release,
  };