diff options
| author | Huacai Chen <chenhuacai@loongson.cn> | 2024-09-17 22:20:12 +0800 |
|---|---|---|
| committer | Huacai Chen <chenhuacai@loongson.cn> | 2024-09-17 22:20:12 +0800 |
| commit | 987cbafe628ae67fe6cad0ce1dcc41743147ef3e (patch) | |
| tree | b232f4e500eef9f02663c1664531504c970725fd /kernel/time/hrtimer.c | |
| parent | 98f7e32f20d28ec452afb208f9cffc08448a2652 (diff) | |
| parent | a6fe30d1e3657991c832702cecb44576128d7fa3 (diff) | |
Merge tag 'irq-core-2024-09-16' into loongarch-next
LoongArch architecture changes for 6.12 depend on the irq core
changes about AVEC irqchip to avoid confliction, so merge them
to create a base.
Diffstat (limited to 'kernel/time/hrtimer.c')
| -rw-r--r-- | kernel/time/hrtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index b8ee320208d4..836157e09e25 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1757,7 +1757,7 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now, } } -static __latent_entropy void hrtimer_run_softirq(struct softirq_action *h) +static __latent_entropy void hrtimer_run_softirq(void) { struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); unsigned long flags; |