rpms/kernel/devel kernel-2.6.spec, 1.1267, 1.1268 linux-2.6.11-x86_64-fix-put_user.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10773

Modified Files:
	kernel-2.6.spec linux-2.6.11-x86_64-fix-put_user.patch 
Log Message:
Fix the put_user() fix. (#155999)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1267
retrieving revision 1.1268
diff -u -r1.1267 -r1.1268
--- kernel-2.6.spec	25 Apr 2005 23:20:36 -0000	1.1267
+++ kernel-2.6.spec	26 Apr 2005 22:51:05 -0000	1.1268
@@ -1148,6 +1148,9 @@
 %endif
 
 %changelog
+* Tue Apr 26 2005 Dave Jones <davej at redhat.com>
+- Fix the put_user() fix. (#155999)
+
 * Mon Apr 25 2005 Dave Jones <davej at redhat.com>
 - Fix x86-64 put_user()
 - Fix serio oops.

linux-2.6.11-x86_64-fix-put_user.patch:
 getuser.S |    4 ++--
 putuser.S |   39 ++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 17 deletions(-)

Index: linux-2.6.11-x86_64-fix-put_user.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.11-x86_64-fix-put_user.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.11-x86_64-fix-put_user.patch	25 Apr 2005 22:43:50 -0000	1.1
+++ linux-2.6.11-x86_64-fix-put_user.patch	26 Apr 2005 22:51:05 -0000	1.2
@@ -98,3 +98,58 @@
  bad_put_user:
  	movq $(-EFAULT),%rax
 
+
+tree d0278bb7304946182dd4337fcbceb9fc32fb2901
+parent 21b7ef0c6c62a14bc8e1c8c0af4e1f0ba3a56d66
+author Alexander Nyberg <alexn at telia.com> Sat, 23 Apr 2005 00:22:07 -0700
+committer Linus Torvalds <torvalds at ppc970.osdl.org> Sat, 23 Apr 2005 00:22:07 -0700
+
+[PATCH] x86_64: fix new out of line put_user()
+
+The labels after the last put_user patch were misplaced so
+exceptions on the real mov instructions would not be handled.
+
+Noted by Brian Gerst <bgerst at didntduck.org>
+
+
+ x86_64/lib/putuser.S |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+Index: arch/x86_64/lib/putuser.S
+===================================================================
+--- 71e53bd0464abd14d6b37c5b4487eaa438d46b65/arch/x86_64/lib/putuser.S  (mode:100644 sha1:d9d3e5ec9ad196a9d2c20617abcb1066aa2f4132)
++++ d0278bb7304946182dd4337fcbceb9fc32fb2901/arch/x86_64/lib/putuser.S  (mode:100644 sha1:5828b8191667da13f3295034a685f474746ce3b2)
+@@ -49,8 +49,8 @@ __put_user_2:
+ 	jc 20f
+ 	cmpq threadinfo_addr_limit(%r8),%rcx
+ 	jae 20f
+-2:	decq %rcx
+-	movw %dx,(%rcx)
++	decq %rcx
++2:	movw %dx,(%rcx)
+ 	xorl %eax,%eax
+ 	ret
+ 20:	decq %rcx
+@@ -64,8 +64,8 @@ __put_user_4:
+ 	jc 30f
+ 	cmpq threadinfo_addr_limit(%r8),%rcx
+ 	jae 30f
+-3:	subq $3,%rcx
+-	movl %edx,(%rcx)
++	subq $3,%rcx
++3:	movl %edx,(%rcx)
+ 	xorl %eax,%eax
+ 	ret
+ 30:	subq $3,%rcx
+@@ -79,8 +79,8 @@ __put_user_8:
+ 	jc 40f
+ 	cmpq threadinfo_addr_limit(%r8),%rcx
+ 	jae 40f
+-4:	subq $7,%rcx
+-	movq %rdx,(%rcx)
++	subq $7,%rcx
++4:	movq %rdx,(%rcx)
+ 	xorl %eax,%eax
+ 	ret
+ 40:	subq $7,%rcx
+