Merge 3f614ab563 ("Merge tag 'irq-core-2023-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline

Steps on the way to 6.4-rc1

Change-Id: I2d19c612013216fc49a9cf0bf94fb520ffa78963
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-05-16 17:03:54 +00:00
44 changed files with 1094 additions and 458 deletions
+7 -2
View File
@@ -796,10 +796,15 @@ static void tasklet_action_common(struct softirq_action *a,
if (tasklet_trylock(t)) {
if (!atomic_read(&t->count)) {
if (tasklet_clear_sched(t)) {
if (t->use_callback)
if (t->use_callback) {
trace_tasklet_entry(t, t->callback);
t->callback(t);
else
trace_tasklet_exit(t, t->callback);
} else {
trace_tasklet_entry(t, t->func);
t->func(t->data);
trace_tasklet_exit(t, t->func);
}
}
tasklet_unlock(t);
continue;