## Automatically generated incremental diff
## From:   linux-2.2.23-rc1
## To:     linux-2.2.23-rc2
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.2.23-rc1/Makefile linux-2.2.23-rc2/Makefile
--- linux-2.2.23-rc1/Makefile	Wed Nov 20 08:12:22 2002
+++ linux-2.2.23-rc2/Makefile	Wed Nov 20 08:12:23 2002
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 23
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.23-rc1/arch/i386/kernel/entry.S linux-2.2.23-rc2/arch/i386/kernel/entry.S
--- linux-2.2.23-rc1/arch/i386/kernel/entry.S	Mon May 20 16:32:34 2002
+++ linux-2.2.23-rc2/arch/i386/kernel/entry.S	Wed Nov 20 08:12:23 2002
@@ -63,7 +63,9 @@
 OLDSS		= 0x38
 
 CF_MASK		= 0x00000001
+TF_MASK		= 0x00000100
 IF_MASK		= 0x00000200
+DF_MASK		= 0x00000400
 NT_MASK		= 0x00004000
 VM_MASK		= 0x00020000
 
@@ -139,6 +141,9 @@
 	movl CS(%esp),%edx	# this is eip..
 	movl EFLAGS(%esp),%ecx	# and this is cs..
 	movl %eax,EFLAGS(%esp)	#
+	andl $~(NT_MASK|TF_MASK|DF_MASK), %eax
+	pushl %eax
+	popfl
 	movl %edx,EIP(%esp)	# Now we move them to their "normal" places
 	movl %ecx,CS(%esp)	#
 	movl %esp,%ebx
@@ -256,6 +261,9 @@
 	pushl $ SYMBOL_NAME(do_divide_error)
 	ALIGN
 error_code:
+	pushfl
+	andl $~(NT_MASK|TF_MASK|DF_MASK), (%esp)
+	popfl
 	pushl %ds
 	pushl %eax
 	xorl %eax,%eax
@@ -266,7 +274,6 @@
 	decl %eax			# eax = -1
 	pushl %ecx
 	pushl %ebx
-	cld
 	movl %es,%cx
 	movl ORIG_EAX(%esp), %esi	# get the error code
 	movl ES(%esp), %edi		# get the function address
diff -urN linux-2.2.23-rc1/arch/i386/kernel/traps.c linux-2.2.23-rc2/arch/i386/kernel/traps.c
--- linux-2.2.23-rc1/arch/i386/kernel/traps.c	Mon May 20 16:32:34 2002
+++ linux-2.2.23-rc2/arch/i386/kernel/traps.c	Wed Nov 20 08:12:23 2002
@@ -419,7 +419,7 @@
 	return;
 
 clear_TF:
-	regs->eflags &= ~TF_MASK;
+	regs->eflags &= ~(TF_MASK|NT_MASK);
 	return;
 }
 
