patch-2.4.22 linux-2.4.22/arch/mips/kernel/entry.S

Next file: linux-2.4.22/arch/mips/kernel/gdb-low.S
Previous file: linux-2.4.22/arch/mips/kernel/cpu-probe.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/mips/kernel/entry.S linux-2.4.22/arch/mips/kernel/entry.S
@@ -28,7 +28,7 @@
 
 
 		.text
-		.align 4
+		.align	5
 		.set	push
 		.set	reorder
 FEXPORT(ret_from_irq)
@@ -100,6 +100,9 @@
 		 * and R4400 SC and MC versions.
 		 */
 NESTED(except_vec3_generic, 0, sp)
+#if R5432_CP0_INTERRUPT_WAR
+		mfc0	k0, CP0_INDEX
+#endif
 		mfc0	k1, CP0_CAUSE
 		la	k0, exception_handlers
 		andi	k1, k1, 0x7c
@@ -114,9 +117,6 @@
 		.set	push
 		.set    mips3
 		.set	noat
-#if defined(R5432_CP0_INTERRUPT_WAR)
-		mfc0	k0, CP0_INDEX
-#endif
 		mfc0	k1, CP0_CAUSE
 		li	k0, 31<<2
 		andi	k1, k1, 0x7c
@@ -232,6 +232,7 @@
 		BUILD_HANDLER(ov,ov,sti,silent)			/* #12 */
 		BUILD_HANDLER(tr,tr,sti,silent)			/* #13 */
 		BUILD_HANDLER(fpe,fpe,fpe,silent)		/* #15 */
+		BUILD_HANDLER(mdmx,mdmx,sti,silent)		/* #22 */
 		BUILD_HANDLER(watch,watch,sti,silent)		/* #23 */
 		BUILD_HANDLER(mcheck,mcheck,cli,silent)		/* #24 */
 		BUILD_HANDLER(reserved,reserved,sti,silent)	/* others */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)