svn commit: r206830 - in user/jmallett/octeon/sys/mips: include mips

[Juli Mallett]

Author: jmallett
Date: Mon Apr 19 06:37:18 2010
New Revision: 206830
URL: http://svn.freebsd.org/changeset/base/206830

Log:
  Go back to old cpu_intr calling convention.

Modified:
  user/jmallett/octeon/sys/mips/include/intr_machdep.h
  user/jmallett/octeon/sys/mips/mips/exception.S
  user/jmallett/octeon/sys/mips/mips/intr_machdep.c

Modified: user/jmallett/octeon/sys/mips/include/intr_machdep.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/intr_machdep.h	Mon Apr 19 06:01:58 2010	(r206829)
+++ user/jmallett/octeon/sys/mips/include/intr_machdep.h	Mon Apr 19 06:37:18 2010	(r206830)
@@ -43,7 +43,7 @@ void cpu_establish_hardintr(const char *
     void *, int, int, void **);
 void cpu_establish_softintr(const char *, driver_filter_t *, void (*)(void*), 
     void *, int, int, void **);
-register_t cpu_intr(struct trapframe *);
+void cpu_intr(struct trapframe *);
 
 /*
  * Allow a platform to override the default hard interrupt mask and unmask

Modified: user/jmallett/octeon/sys/mips/mips/exception.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/exception.S	Mon Apr 19 06:01:58 2010	(r206829)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Mon Apr 19 06:37:18 2010	(r206830)
@@ -604,6 +604,7 @@ NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_S
 	and	a1, a1, ~SR_INT_MASK
 	or	a1, a1, a0
 	SAVE_REG(a1, SR, sp)
+	REG_L	v0, CALLFRAME_RA + KERN_REG_SIZE(sp)
 	RESTORE_CPU			# v0 contains the return address.
 	sync
 	eret

Modified: user/jmallett/octeon/sys/mips/mips/intr_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/intr_machdep.c	Mon Apr 19 06:01:58 2010	(r206829)
+++ user/jmallett/octeon/sys/mips/mips/intr_machdep.c	Mon Apr 19 06:37:18 2010	(r206830)
@@ -213,7 +213,7 @@ cpu_establish_softintr(const char *name,
 	mips_intrcnt_setname(mips_intr_counters[irq], event->ie_fullname);
 }
 
-register_t
+void
 cpu_intr(struct trapframe *tf)
 {
 	struct intr_event *event;
@@ -266,6 +266,4 @@ cpu_intr(struct trapframe *tf)
 	KASSERT(i == 0, ("all interrupts handled"));
 
 	critical_exit();
-
-	return (tf->pc);
 }