diff -urN --exclude-from=/home/davej/.exclude linux-2.4.15pre6/arch/i386/kernel/entry.S linux-ac/arch/i386/kernel/entry.S
--- linux-2.4.15pre6/arch/i386/kernel/entry.S	Sat Nov  3 01:18:49 2001
+++ linux-ac/arch/i386/kernel/entry.S	Mon Nov 19 14:09:18 2001
@@ -105,10 +105,16 @@
 	popl %edi;	\
 	popl %ebp;	\
 	popl %eax;	\
+	cmpl $__KERNEL_DS,(%esp); \
+	jne 1f ; \
+	cmpl $__KERNEL_DS,4(%esp); \
+	je 4f ; \
 1:	popl %ds;	\
 2:	popl %es;	\
 	addl $4,%esp;	\
 3:	iret;		\
+4:	addl $12,%esp;	\
+	iret; \
 .section .fixup,"ax";	\
 4:	movl $0,(%esp);	\
 	jmp 1b;		\