Conflicts: kernel/trace/trace_events_filter.c We use the tracing/core version.
Showing the changes to kernel/trace/trace_stack.c (1 of 1029 files). Show all
Unified · Split
| @@ -294,17 +294,14 @@ static const struct seq_operations stack_trace_seq_ops = { · 293 unmodified lines | |||
| 294 | 294 | ||
| 295 | static int stack_trace_open(struct inode *inode, struct file *file) | 295 | static int stack_trace_open(struct inode *inode, struct file *file) |
| 296 | { | 296 | { |
| 297 | int ret; | 297 | return seq_open(file, &stack_trace_seq_ops); |
| 298 | |||
| 299 | ret = seq_open(file, &stack_trace_seq_ops); | ||
| 300 | |||
| 301 | return ret; | ||
| 302 | } | 298 | } |
| 303 | 299 | ||
| 304 | static const struct file_operations stack_trace_fops = { | 300 | static const struct file_operations stack_trace_fops = { |
| 305 | .open = stack_trace_open, | 301 | .open = stack_trace_open, |
| 306 | .read = seq_read, | 302 | .read = seq_read, |
| 307 | .llseek = seq_lseek, | 303 | .llseek = seq_lseek, |
| 304 | .release = seq_release, | ||
| 308 | }; | 305 | }; |
| 309 | 306 | ||
| 310 | int | 307 | int |