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

Next file: linux-2.4.22/arch/mips/kernel/i8259.c
Previous file: linux-2.4.22/arch/mips/kernel/gdb-stub.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/arch/mips/kernel/head.S linux-2.4.22/arch/mips/kernel/head.S
@@ -91,6 +91,8 @@
 		 nop
 		END(except_vec_ejtag_debug)
 
+		__FINIT
+
 		/*
 		 * EJTAG debug exception handler.
 		 */
@@ -114,11 +116,15 @@
 
 ejtag_return:
 		mfc0	k0, CP0_DESAVE
-		.word	0x4200001f     # DERET, return from EJTAG debug exception.
+		.set	mips32
+		deret
+		.set	mips0
 		 nop
 		.set	at
 		END(ejtag_debug_handler)
 
+		__INIT
+
 		/*
 		* NMI debug exception handler for MIPS reference boards.
 		* The NMI debug exception entry point is 0xbfc00000, which
@@ -130,6 +136,8 @@
 		 nop
 		END(except_vec_nmi)
 
+		__FINIT
+
 		NESTED(nmi_handler, PT_SIZE, sp)
 		.set    noat
 		.set    noreorder
@@ -143,6 +151,8 @@
 		.set    mips0
 		END(nmi_handler)
 
+		__INIT
+
 		/*
 		 * Kernel entry point
 		 */

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