diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-10-11 04:20:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:14 -0400 |
commit | 4e0fadfcf62e252d2b14de0e0927eb2830c0c28c (patch) | |
tree | eb88e5fe9c32e352dabb4e2d62e3492604565c7b /arch/avr32/kernel/time.c | |
parent | 41716c7c21b15e7ecf14f0caf1eef3980707fb74 (diff) |
[PATCH] IRQ: Fix AVR32 breakage
Make the necessary changes to AVR32 required by the irq regs stuff.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/avr32/kernel/time.c')
-rw-r--r-- | arch/avr32/kernel/time.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c index 3e56b9f4358a..5a247ba71a72 100644 --- a/arch/avr32/kernel/time.c +++ b/arch/avr32/kernel/time.c | |||
@@ -124,15 +124,15 @@ unsigned long long sched_clock(void) | |||
124 | * | 124 | * |
125 | * In UP mode, it is invoked from the (global) timer_interrupt. | 125 | * In UP mode, it is invoked from the (global) timer_interrupt. |
126 | */ | 126 | */ |
127 | static void local_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 127 | static void local_timer_interrupt(int irq, void *dev_id) |
128 | { | 128 | { |
129 | if (current->pid) | 129 | if (current->pid) |
130 | profile_tick(CPU_PROFILING, regs); | 130 | profile_tick(CPU_PROFILING); |
131 | update_process_times(user_mode(regs)); | 131 | update_process_times(user_mode(get_irq_regs())); |
132 | } | 132 | } |
133 | 133 | ||
134 | static irqreturn_t | 134 | static irqreturn_t |
135 | timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 135 | timer_interrupt(int irq, void *dev_id) |
136 | { | 136 | { |
137 | unsigned int count; | 137 | unsigned int count; |
138 | 138 | ||
@@ -157,7 +157,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
157 | * | 157 | * |
158 | * SMP is not supported yet. | 158 | * SMP is not supported yet. |
159 | */ | 159 | */ |
160 | local_timer_interrupt(irq, dev_id, regs); | 160 | local_timer_interrupt(irq, dev_id); |
161 | 161 | ||
162 | return IRQ_HANDLED; | 162 | return IRQ_HANDLED; |
163 | } | 163 | } |