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/timer.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/timer.c')
| -rw-r--r-- | kernel/time/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 64b0d8a0aa0f..760bbeb1f331 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2440,7 +2440,7 @@ static void run_timer_base(int index) /* * This function runs timers and the timer-tq in bottom half context. */ -static __latent_entropy void run_timer_softirq(struct softirq_action *h) +static __latent_entropy void run_timer_softirq(void) { run_timer_base(BASE_LOCAL); if (IS_ENABLED(CONFIG_NO_HZ_COMMON)) { |