diff options
Diffstat (limited to 'arch/xtensa/kernel/time.c')
-rw-r--r-- | arch/xtensa/kernel/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 37347e369987..a350431363a0 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -47,7 +47,7 @@ unsigned long long sched_clock(void) | |||
47 | return (unsigned long long)jiffies * (1000000000 / HZ); | 47 | return (unsigned long long)jiffies * (1000000000 / HZ); |
48 | } | 48 | } |
49 | 49 | ||
50 | static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 50 | static irqreturn_t timer_interrupt(int irq, void *dev_id); |
51 | static struct irqaction timer_irqaction = { | 51 | static struct irqaction timer_irqaction = { |
52 | .handler = timer_interrupt, | 52 | .handler = timer_interrupt, |
53 | .flags = IRQF_DISABLED, | 53 | .flags = IRQF_DISABLED, |
@@ -150,7 +150,7 @@ EXPORT_SYMBOL(do_gettimeofday); | |||
150 | * The timer interrupt is called HZ times per second. | 150 | * The timer interrupt is called HZ times per second. |
151 | */ | 151 | */ |
152 | 152 | ||
153 | irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) | 153 | irqreturn_t timer_interrupt (int irq, void *dev_id) |
154 | { | 154 | { |
155 | 155 | ||
156 | unsigned long next; | 156 | unsigned long next; |
@@ -160,9 +160,9 @@ irqreturn_t timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) | |||
160 | again: | 160 | again: |
161 | while ((signed long)(get_ccount() - next) > 0) { | 161 | while ((signed long)(get_ccount() - next) > 0) { |
162 | 162 | ||
163 | profile_tick(CPU_PROFILING, regs); | 163 | profile_tick(CPU_PROFILING); |
164 | #ifndef CONFIG_SMP | 164 | #ifndef CONFIG_SMP |
165 | update_process_times(user_mode(regs)); | 165 | update_process_times(user_mode(get_irq_regs())); |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | write_seqlock(&xtime_lock); | 168 | write_seqlock(&xtime_lock); |