patch-2.4.6 linux/arch/ppc/8xx_io/commproc.c
Next file: linux/arch/ppc/8xx_io/commproc.h
Previous file: linux/arch/parisc/vmlinux.lds
Back to the patch index
Back to the overall index
- Lines: 49
- Date:
Mon Jul 2 14:34:57 2001
- Orig file:
v2.4.5/linux/arch/ppc/8xx_io/commproc.c
- Orig date:
Mon May 21 17:04:46 2001
diff -u --recursive --new-file v2.4.5/linux/arch/ppc/8xx_io/commproc.c linux/arch/ppc/8xx_io/commproc.c
@@ -1,5 +1,5 @@
/*
- * BK Id: SCCS/s.commproc.c 1.8 05/18/01 07:54:04 patch
+ * BK Id: SCCS/s.commproc.c 1.11 06/15/01 13:00:20 paulus
*/
/*
@@ -47,12 +47,12 @@
/* CPM interrupt vector functions.
*/
struct cpm_action {
- void (*handler)(void *);
+ void (*handler)(void *, struct pt_regs * regs);
void *dev_id;
};
static struct cpm_action cpm_vecs[CPMVEC_NR];
static void cpm_interrupt(int irq, void * dev, struct pt_regs * regs);
-static void cpm_error_interrupt(void *);
+static void cpm_error_interrupt(void *, struct pt_regs * regs);
void
m8xx_cpm_reset(uint host_page_addr)
@@ -129,7 +129,7 @@
vec >>= 11;
if (cpm_vecs[vec].handler != 0)
- (*cpm_vecs[vec].handler)(cpm_vecs[vec].dev_id);
+ (*cpm_vecs[vec].handler)(cpm_vecs[vec].dev_id, regs);
else
((immap_t *)IMAP_ADDR)->im_cpic.cpic_cimr &= ~(1 << vec);
@@ -146,14 +146,15 @@
* tests in the interrupt handler.
*/
static void
-cpm_error_interrupt(void *dev)
+cpm_error_interrupt(void *dev, struct pt_regs *regs)
{
}
/* Install a CPM interrupt handler.
*/
void
-cpm_install_handler(int vec, void (*handler)(void *), void *dev_id)
+cpm_install_handler(int vec, void (*handler)(void *, struct pt_regs *regs),
+ void *dev_id)
{
/* If null handler, assume we are trying to free the IRQ.
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)