diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-16 15:39:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-16 15:39:23 +0200 |
| commit | d6da35e0c6d50f76eaf11a0496d3d2ec1a1fea3f (patch) | |
| tree | c757e3701fbe9dbbf35525e980bd155c244cce52 /kernel/trace/trace_osnoise.c | |
| parent | 4419da5d5d4b1788568b7bf22c083ba2832891df (diff) | |
| parent | 42226c989789d8da4af1de0c31070c96726d990c (diff) | |
Merge 5.18-rc7 into usb-next
We need the tty fixes in here as well, as we need to revert one of them :(
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace/trace_osnoise.c')
| -rw-r--r-- | kernel/trace/trace_osnoise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c index e9ae1f33a7f03..afb92e2f0aeab 100644 --- a/kernel/trace/trace_osnoise.c +++ b/kernel/trace/trace_osnoise.c @@ -1168,9 +1168,9 @@ thread_exit(struct osnoise_variables *osn_var, struct task_struct *t) */ static void trace_sched_switch_callback(void *data, bool preempt, - unsigned int prev_state, struct task_struct *p, - struct task_struct *n) + struct task_struct *n, + unsigned int prev_state) { struct osnoise_variables *osn_var = this_cpu_osn_var(); |