diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-21 10:57:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-21 10:57:33 +0200 |
| commit | 73e21ce28d8d2b75140b742b01373c3a085ecc52 (patch) | |
| tree | add380154271f9a68be4099590f912b4ab4bed9f /kernel/trace/trace_stack.c | |
| parent | b5210b2a34bae35fc00675462333af45676d727c (diff) | |
| parent | f1923820c447e986a9da0fc6bf60c1dccdf0408e (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event_intel.c
Merge in the latest fixes before applying new patches, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 42ca822fc701..83a8b5b7bd35 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -322,7 +322,7 @@ static const struct file_operations stack_trace_filter_fops = { .open = stack_trace_filter_open, .read = seq_read, .write = ftrace_filter_write, - .llseek = ftrace_regex_lseek, + .llseek = ftrace_filter_lseek, .release = ftrace_regex_release, }; |