summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-12-16 11:21:24 +0100
committerIngo Molnar <mingo@elte.hu>2010-12-16 11:21:24 +0100
commitd949750fed168b6553ca11ed19e4affd19d7a4d7 (patch)
treea98953ef3448b7b4909f1d90be266e0cfbdff328 /kernel
parentce677831a4abd0f9f957c90ac6f6a0d0472bafb4 (diff)
parente63233f75a1a6bfa97ffb52a20cc6801a4c63fb2 (diff)
downloadblackbird-op-linux-d949750fed168b6553ca11ed19e4affd19d7a4d7.tar.gz
blackbird-op-linux-d949750fed168b6553ca11ed19e4affd19d7a4d7.zip
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c380612273bf..f8cf959bad45 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2338,11 +2338,19 @@ tracing_write_stub(struct file *filp, const char __user *ubuf,
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,
};
OpenPOWER on IntegriCloud