diff options
| author |   Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-03-31 09:49:07 -0400 |
| commit | 6d32c850621b0be75777b9102b14f6268bbd9f0f (patch) | |
| tree | fec325f5c1ae763f5eccb3ca1254ab9d9d164b05 /kernel/trace/trace_stack.c | |
| parent | selinux: correctly label /proc inodes in use before the policy is loaded (diff) | |
| parent | Linux 3.14 (diff) | |
| download | wireguard-linux-6d32c850621b0be75777b9102b14f6268bbd9f0f.tar.xz wireguard-linux-6d32c850621b0be75777b9102b14f6268bbd9f0f.zip | |
Merge tag 'v3.14' into next
Linux 3.14
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index b20428c5efe2..e6be585cf06a 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -382,7 +382,7 @@ static const struct file_operations stack_trace_filter_fops = { .open = stack_trace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_filter_lseek, + .llseek = tracing_lseek, .release = ftrace_regex_release, }; |