diff options
Diffstat (limited to 'arch/um/kernel/time.c')
-rw-r--r-- | arch/um/kernel/time.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 3571703a7cb4..90e24e2dbeaa 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "asm/param.h" | 18 | #include "asm/param.h" |
19 | #include "asm/current.h" | 19 | #include "asm/current.h" |
20 | #include "kern_util.h" | 20 | #include "kern_util.h" |
21 | #include "mode.h" | ||
22 | #include "os.h" | 21 | #include "os.h" |
23 | 22 | ||
24 | int hz(void) | 23 | int hz(void) |
@@ -39,7 +38,7 @@ static unsigned long long prev_nsecs[NR_CPUS]; | |||
39 | static long long delta[NR_CPUS]; /* Deviation per interval */ | 38 | static long long delta[NR_CPUS]; /* Deviation per interval */ |
40 | #endif | 39 | #endif |
41 | 40 | ||
42 | void timer_irq(union uml_pt_regs *regs) | 41 | void timer_irq(struct uml_pt_regs *regs) |
43 | { | 42 | { |
44 | unsigned long long ticks = 0; | 43 | unsigned long long ticks = 0; |
45 | #ifdef CONFIG_UML_REAL_TIME_CLOCK | 44 | #ifdef CONFIG_UML_REAL_TIME_CLOCK |
@@ -175,13 +174,13 @@ int do_settimeofday(struct timespec *tv) | |||
175 | return 0; | 174 | return 0; |
176 | } | 175 | } |
177 | 176 | ||
178 | void timer_handler(int sig, union uml_pt_regs *regs) | 177 | void timer_handler(int sig, struct uml_pt_regs *regs) |
179 | { | 178 | { |
180 | if(current_thread->cpu == 0) | 179 | if(current_thread->cpu == 0) |
181 | timer_irq(regs); | 180 | timer_irq(regs); |
182 | local_irq_disable(); | 181 | local_irq_disable(); |
183 | irq_enter(); | 182 | irq_enter(); |
184 | update_process_times((regs)->skas.is_user); | 183 | update_process_times(regs->is_user); |
185 | irq_exit(); | 184 | irq_exit(); |
186 | local_irq_enable(); | 185 | local_irq_enable(); |
187 | } | 186 | } |