aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/vtime.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2006-10-06 10:38:35 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-10-06 10:38:35 -0400
commit5a489b9846f688db7e69aa7ccb23c53459a9c20e (patch)
tree1aaf8eb887f23bf65c25a70b50c9c83e5a1d2f31 /arch/s390/kernel/vtime.c
parent7e8ae7bfe8354b1f1b98c5cd29db8965ca1e6391 (diff)
[S390] irq change build fixes.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/vtime.c')
-rw-r--r--arch/s390/kernel/vtime.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 2306cd83fca1..1d7d3938b2b1 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -22,6 +22,7 @@
22 22
23#include <asm/s390_ext.h> 23#include <asm/s390_ext.h>
24#include <asm/timer.h> 24#include <asm/timer.h>
25#include <asm/irq_regs.h>
25 26
26static ext_int_info_t ext_int_info_timer; 27static ext_int_info_t ext_int_info_timer;
27DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer); 28DEFINE_PER_CPU(struct vtimer_queue, virt_cpu_timer);
@@ -241,7 +242,7 @@ static void do_callbacks(struct list_head *cb_list, struct pt_regs *regs)
241/* 242/*
242 * Handler for the virtual CPU timer. 243 * Handler for the virtual CPU timer.
243 */ 244 */
244static void do_cpu_timer_interrupt(struct pt_regs *regs, __u16 error_code) 245static void do_cpu_timer_interrupt(__u16 error_code)
245{ 246{
246 int cpu; 247 int cpu;
247 __u64 next, delta; 248 __u64 next, delta;
@@ -274,7 +275,7 @@ static void do_cpu_timer_interrupt(struct pt_regs *regs, __u16 error_code)
274 list_move_tail(&event->entry, &cb_list); 275 list_move_tail(&event->entry, &cb_list);
275 } 276 }
276 spin_unlock(&vt_list->lock); 277 spin_unlock(&vt_list->lock);
277 do_callbacks(&cb_list, regs); 278 do_callbacks(&cb_list, get_irq_regs());
278 279
279 /* next event is first in list */ 280 /* next event is first in list */
280 spin_lock(&vt_list->lock); 281 spin_lock(&vt_list->lock);