Commit e814d826 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is enabled

The patch adds the ENDPROC declarations for the __copy_to_user_std and
__clear_user_std functions. Without these, the compiler generates BXL to
ARM when compiling the kernel in Thumb-2 mode.
Reported-by: default avatarKyungmin Park <>
Tested-by: default avatarKyungmin Park <>
Signed-off-by: default avatarCatalin Marinas <>
Acked-by: default avatarNicolas Pitre <>
Signed-off-by: default avatarRussell King <>
parent b8349b56
...@@ -45,6 +45,7 @@ USER( strnebt r2, [r0]) ...@@ -45,6 +45,7 @@ USER( strnebt r2, [r0])
mov r0, #0 mov r0, #0
ldmfd sp!, {r1, pc} ldmfd sp!, {r1, pc}
ENDPROC(__clear_user) ENDPROC(__clear_user)
.pushsection .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
...@@ -93,6 +93,7 @@ WEAK(__copy_to_user) ...@@ -93,6 +93,7 @@ WEAK(__copy_to_user)
#include "copy_template.S" #include "copy_template.S"
ENDPROC(__copy_to_user) ENDPROC(__copy_to_user)
.pushsection .fixup,"ax" .pushsection .fixup,"ax"
.align 0 .align 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment