Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd962a9 authored Jul 30, 2008 by Vitaly Mayatskikh Committed by Linus Torvalds Jul 30, 2008

x86: wrong register was used in align macro



New ALIGN_DESTINATION macro has sad typo: r8d register was used instead
of ecx in fixup section. This can be considered as a regression.

Register ecx was also wrongly loaded with value in r8d in
copy_user_nocache routine.

Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bd3e64c1

arch/x86/lib/copy_user_64.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@
		jnz 100b
		102:
		.section .fixup,"ax"
		103: addl %r8d,%edx /* ecx is zerorest also */
		103: addl %ecx,%edx /* ecx is zerorest also */
		jmp copy_user_handle_tail
		.previous

arch/x86/lib/copy_user_nocache_64.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@
		jnz 100b
		102:
		.section .fixup,"ax"
		103: addl %r8d,%edx /* ecx is zerorest also */
		103: addl %ecx,%edx /* ecx is zerorest also */
		jmp copy_user_handle_tail
		.previous

		@@ -108,7 +108,6 @@ ENTRY(__copy_user_nocache)
		jmp 60f
		50: movl %ecx,%edx
		60: sfence
		movl %r8d,%ecx
		jmp copy_user_handle_tail
		.previous