forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/arch/ia64/kernel/time.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * linux/arch/ia64/kernel/time.c
34 *
....@@ -24,7 +25,6 @@
2425 #include <linux/platform_device.h>
2526 #include <linux/sched/cputime.h>
2627
27
-#include <asm/machvec.h>
2828 #include <asm/delay.h>
2929 #include <asm/hw_irq.h>
3030 #include <asm/ptrace.h>
....@@ -32,6 +32,7 @@
3232 #include <asm/sections.h>
3333
3434 #include "fsyscall_gtod_data.h"
35
+#include "irq.h"
3536
3637 static u64 itc_get_cycles(struct clocksource *cs);
3738
....@@ -132,7 +133,7 @@
132133 return delta_stime;
133134 }
134135
135
-void vtime_account_system(struct task_struct *tsk)
136
+void vtime_account_kernel(struct task_struct *tsk)
136137 {
137138 struct thread_info *ti = task_thread_info(tsk);
138139 __u64 stime = vtime_delta(tsk);
....@@ -146,7 +147,7 @@
146147 else
147148 ti->stime += stime;
148149 }
149
-EXPORT_SYMBOL_GPL(vtime_account_system);
150
+EXPORT_SYMBOL_GPL(vtime_account_kernel);
150151
151152 void vtime_account_idle(struct task_struct *tsk)
152153 {
....@@ -165,8 +166,6 @@
165166 if (cpu_is_offline(smp_processor_id())) {
166167 return IRQ_HANDLED;
167168 }
168
-
169
- platform_timer_interrupt(irq, dev_id);
170169
171170 new_itm = local_cpu_data->itm_next;
172171
....@@ -382,13 +381,6 @@
382381 return now;
383382 }
384383
385
-
386
-static struct irqaction timer_irqaction = {
387
- .handler = timer_interrupt,
388
- .flags = IRQF_IRQPOLL,
389
- .name = "timer"
390
-};
391
-
392384 void read_persistent_clock64(struct timespec64 *ts)
393385 {
394386 efi_gettimeofday(ts);
....@@ -397,7 +389,8 @@
397389 void __init
398390 time_init (void)
399391 {
400
- register_percpu_irq(IA64_TIMER_VECTOR, &timer_irqaction);
392
+ register_percpu_irq(IA64_TIMER_VECTOR, timer_interrupt, IRQF_IRQPOLL,
393
+ "timer");
401394 ia64_init_itm();
402395 }
403396