Merge tag 'irq-urgent-2023-10-10-v2' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-rpi.git] / arch / x86 / lib / putuser.S

diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
index 3062d09..235bbda 100644 (file)
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
@@ -56,7 +56,6 @@ SYM_FUNC_END(__put_user_1)
 EXPORT_SYMBOL(__put_user_1)
 
 SYM_FUNC_START(__put_user_nocheck_1)
-       ENDBR
        ASM_STAC
 2:     movb %al,(%_ASM_CX)
        xor %ecx,%ecx
@@ -76,7 +75,6 @@ SYM_FUNC_END(__put_user_2)
 EXPORT_SYMBOL(__put_user_2)
 
 SYM_FUNC_START(__put_user_nocheck_2)
-       ENDBR
        ASM_STAC
 4:     movw %ax,(%_ASM_CX)
        xor %ecx,%ecx
@@ -96,7 +94,6 @@ SYM_FUNC_END(__put_user_4)
 EXPORT_SYMBOL(__put_user_4)
 
 SYM_FUNC_START(__put_user_nocheck_4)
-       ENDBR
        ASM_STAC
 6:     movl %eax,(%_ASM_CX)
        xor %ecx,%ecx
@@ -119,7 +116,6 @@ SYM_FUNC_END(__put_user_8)
 EXPORT_SYMBOL(__put_user_8)
 
 SYM_FUNC_START(__put_user_nocheck_8)
-       ENDBR
        ASM_STAC
 9:     mov %_ASM_AX,(%_ASM_CX)
 #ifdef CONFIG_X86_32
@@ -131,22 +127,22 @@ SYM_FUNC_START(__put_user_nocheck_8)
 SYM_FUNC_END(__put_user_nocheck_8)
 EXPORT_SYMBOL(__put_user_nocheck_8)
 
-SYM_CODE_START_LOCAL(.Lbad_put_user_clac)
+SYM_CODE_START_LOCAL(__put_user_handle_exception)
        ASM_CLAC
 .Lbad_put_user:
        movl $-EFAULT,%ecx
        RET
-SYM_CODE_END(.Lbad_put_user_clac)
+SYM_CODE_END(__put_user_handle_exception)
 
-       _ASM_EXTABLE(1b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(2b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(3b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(4b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(5b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(6b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(7b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(9b, .Lbad_put_user_clac)
+       _ASM_EXTABLE(1b, __put_user_handle_exception)
+       _ASM_EXTABLE(2b, __put_user_handle_exception)
+       _ASM_EXTABLE(3b, __put_user_handle_exception)
+       _ASM_EXTABLE(4b, __put_user_handle_exception)
+       _ASM_EXTABLE(5b, __put_user_handle_exception)
+       _ASM_EXTABLE(6b, __put_user_handle_exception)
+       _ASM_EXTABLE(7b, __put_user_handle_exception)
+       _ASM_EXTABLE(9b, __put_user_handle_exception)
 #ifdef CONFIG_X86_32
-       _ASM_EXTABLE(8b, .Lbad_put_user_clac)
-       _ASM_EXTABLE(10b, .Lbad_put_user_clac)
+       _ASM_EXTABLE(8b, __put_user_handle_exception)
+       _ASM_EXTABLE(10b, __put_user_handle_exception)
 #endif