Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv29836/arch/vax/kernel
Modified Files:
interrupt.c time.c
Log Message:
Interrupt handlers need to return an irqreturn_t in 2.5.69
Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- interrupt.c 27 Aug 2003 00:35:03 -0000 1.13
+++ interrupt.c 28 Aug 2003 21:38:02 -0000 1.14
@@ -622,7 +622,7 @@
}
int request_irq(unsigned int irq,
- void (*handler)(int, void *, struct pt_regs *),
+ irqreturn_t (*handler)(int, void *, struct pt_regs *),
unsigned long irqflags,
const char * devname,
void *dev_id)
Index: time.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/time.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- time.c 4 Aug 2003 23:37:54 -0000 1.11
+++ time.c 28 Aug 2003 21:38:02 -0000 1.12
@@ -42,7 +42,7 @@
/* protos */
static int set_rtc_mmss(unsigned long nowtime);
-static void do_timer_interrupt(int vec_num, void *dev_id, struct pt_regs *regs);
+static irqreturn_t do_timer_interrupt(int vec_num, void *dev_id, struct pt_regs *regs);
static unsigned long do_gettimeoffset(void);
void time_init(void);
void do_gettimeofday(struct timeval *tv);
@@ -141,7 +141,7 @@
/* This is the interrupt service routine for the timer interrupt */
-static void do_timer_interrupt(int vec_num, void *dev_id, struct pt_regs *regs)
+static irqreturn_t do_timer_interrupt(int vec_num, void *dev_id, struct pt_regs *regs)
{
unsigned int iccs;
@@ -190,6 +190,7 @@
write_sequnlock(&xtime_lock);
+ return IRQ_HANDLED;
}
/*
|
