diff options
| -rw-r--r-- | i386/i386at/kd_mouse.c | 4 | ||||
| -rw-r--r-- | linux/dev/arch/i386/kernel/irq.c | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c index 0b4acc2..640209c 100644 --- a/i386/i386at/kd_mouse.c +++ b/i386/i386at/kd_mouse.c @@ -93,7 +93,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "kd_mouse.h" -static int (*oldvect)(); /* old interrupt vector */ +static void (*oldvect)(); /* old interrupt vector */ static int oldunit; static spl_t oldspl; extern struct bus_device *cominfo[]; @@ -256,7 +256,7 @@ kd_mouse_open(dev, mouse_pic) int mouse_pic; { spl_t s = splhi(); /* disable interrupts */ - extern int kdintr(); + extern void kdintr(); oldvect = ivect[mouse_pic]; ivect[mouse_pic] = kdintr; diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index 4bed353..8966dea 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -47,7 +47,7 @@ #include <asm/io.h> #include <asm/hardirq.h> -extern int linux_timer_intr (void); +extern void linux_timer_intr (void); extern spl_t splhigh (void); extern spl_t spl0 (void); extern void form_pic_mask (void); @@ -99,13 +99,13 @@ extern spl_t curr_ipl; extern int curr_pic_mask; extern int pic_mask[]; -extern int intnull (), prtnull (); +extern void intnull (), prtnull (); /* * Generic interrupt handler for Linux devices. * Set up a fake `struct pt_regs' then call the real handler. */ -static int +static void linux_intr (int irq) { struct pt_regs regs; @@ -128,9 +128,6 @@ linux_intr (int irq) restore_flags (flags); intr_count--; - - /* Not used. by OKUJI Yoshinori. */ - return 0; } /* @@ -208,11 +205,10 @@ enable_irq (unsigned int irq_nr) /* * Default interrupt handler for Linux. */ -int +void linux_bad_intr (int irq) { mask_irq (irq); - return 0; } static int @@ -685,7 +681,7 @@ void __global_restore_flags(unsigned long flags) #endif -static int (*old_clock_handler) (); +static void (*old_clock_handler) (); static int old_clock_pri; void |