diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-05-18 14:08:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 14:08:53 +1000 |
| commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
| tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /kernel/trace/trace_stack.c | |
| parent | 315852b422972e6ebb1dfddaadada09e46a2681a (diff) | |
| parent | 76ef6b28ea4f81c3d511866a9b31392caa833126 (diff) | |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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 3c7bfc4bf5e9..4237eba4ef20 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -472,7 +472,7 @@ static __init int stack_trace_init(void) NULL, &stack_trace_fops); #ifdef CONFIG_DYNAMIC_FTRACE - trace_create_file("stack_trace_filter", 0444, d_tracer, + trace_create_file("stack_trace_filter", 0644, d_tracer, &trace_ops, &stack_trace_filter_fops); #endif |