patch-2.1.120 linux/arch/i386/kernel/entry.S

Next file: linux/arch/i386/kernel/io_apic.c
Previous file: linux/arch/i386/boot/setup.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.119/linux/arch/i386/kernel/entry.S linux/arch/i386/kernel/entry.S
@@ -105,23 +105,21 @@
 	popl %eax;	\
 1:	popl %ds;	\
 2:	popl %es;	\
-3:	addl $4,%esp;	\
-4:	iret;		\
+	addl $4,%esp;	\
+3:	iret;		\
 .section fixup,"ax";	\
-5:	pushl $0;	\
-	popl %ds;	\
+4:	movl $0,(%esp);	\
+	jmp 1b;		\
+5:	movl $0,(%esp);	\
 	jmp 2b;		\
-6:	pushl $0;	\
-	popl %es;	\
-	jmp 3b;		\
-7:	pushl $11;	\
+6:	pushl $11;	\
 	call do_exit;	\
 .previous;		\
 .section __ex_table,"a";\
 	.align 4;	\
-	.long 1b,5b;	\
-	.long 2b,6b;	\
-	.long 4b,7b;	\
+	.long 1b,4b;	\
+	.long 2b,5b;	\
+	.long 3b,6b;	\
 .previous
 
 #define GET_CURRENT(reg) \

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov