From: Alexey Dobriyan <adobriyan@gmail.com>
To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] x86, putuser: cleanup 32-bit version a little
Date: Sun, 17 Mar 2019 00:04:01 +0300 [thread overview]
Message-ID: <20190316210401.GC21830@avx2> (raw)
Delete CONFIG_X86_32 references and _ASM_* macros.
Don't bother with anything else because i386 is dead.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
arch/x86/lib/putuser_32.S | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
--- a/arch/x86/lib/putuser_32.S
+++ b/arch/x86/lib/putuser_32.S
@@ -31,17 +31,17 @@
* as they get called from within inline assembly.
*/
-#define ENTER mov PER_CPU_VAR(current_task), %_ASM_BX
+#define ENTER mov PER_CPU_VAR(current_task), %ebx
#define EXIT ASM_CLAC ; \
ret
.text
ENTRY(__put_user_1)
ENTER
- cmp TASK_addr_limit(%_ASM_BX),%_ASM_CX
+ cmp TASK_addr_limit(%ebx),%ecx
jae bad_put_user
ASM_STAC
-1: movb %al,(%_ASM_CX)
+1: movb %al,(%ecx)
xor %eax,%eax
EXIT
ENDPROC(__put_user_1)
@@ -49,12 +49,12 @@ EXPORT_SYMBOL(__put_user_1)
ENTRY(__put_user_2)
ENTER
- mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
- sub $1,%_ASM_BX
- cmp %_ASM_BX,%_ASM_CX
+ mov TASK_addr_limit(%ebx),%ebx
+ sub $1,%ebx
+ cmp %ebx,%ecx
jae bad_put_user
ASM_STAC
-2: movw %ax,(%_ASM_CX)
+2: movw %ax,(%ecx)
xor %eax,%eax
EXIT
ENDPROC(__put_user_2)
@@ -62,12 +62,12 @@ EXPORT_SYMBOL(__put_user_2)
ENTRY(__put_user_4)
ENTER
- mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
- sub $3,%_ASM_BX
- cmp %_ASM_BX,%_ASM_CX
+ mov TASK_addr_limit(%ebx),%ebx
+ sub $3,%ebx
+ cmp %ebx,%ecx
jae bad_put_user
ASM_STAC
-3: movl %eax,(%_ASM_CX)
+3: movl %eax,(%ecx)
xor %eax,%eax
EXIT
ENDPROC(__put_user_4)
@@ -75,15 +75,13 @@ EXPORT_SYMBOL(__put_user_4)
ENTRY(__put_user_8)
ENTER
- mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
- sub $7,%_ASM_BX
- cmp %_ASM_BX,%_ASM_CX
+ mov TASK_addr_limit(%ebx),%ebx
+ sub $7,%ebx
+ cmp %ebx,%ecx
jae bad_put_user
ASM_STAC
-4: mov %_ASM_AX,(%_ASM_CX)
-#ifdef CONFIG_X86_32
-5: movl %edx,4(%_ASM_CX)
-#endif
+4: mov %eax,(%ecx)
+5: movl %edx,4(%ecx)
xor %eax,%eax
EXIT
ENDPROC(__put_user_8)
@@ -98,6 +96,4 @@ END(bad_put_user)
_ASM_EXTABLE_UA(2b, bad_put_user)
_ASM_EXTABLE_UA(3b, bad_put_user)
_ASM_EXTABLE_UA(4b, bad_put_user)
-#ifdef CONFIG_X86_32
_ASM_EXTABLE_UA(5b, bad_put_user)
-#endif
reply other threads:[~2019-03-16 21:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190316210401.GC21830@avx2 \
--to=adobriyan@gmail.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.