Skip to content

Commit

Permalink
ARM: 6110/1: Fix Thumb-2 kernel builds when UACCESS_WITH_MEMCPY is en…
Browse files Browse the repository at this point in the history
…abled

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: Kyungmin Park <kmpark@infradead.org>
Tested-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Catalin Marinas authored and Russell King committed May 8, 2010
1 parent b8349b5 commit e814d82
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/lib/clear_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ USER( strnebt r2, [r0])
mov r0, #0
ldmfd sp!, {r1, pc}
ENDPROC(__clear_user)
ENDPROC(__clear_user_std)

.pushsection .fixup,"ax"
.align 0
Expand Down
1 change: 1 addition & 0 deletions arch/arm/lib/copy_to_user.S
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ WEAK(__copy_to_user)
#include "copy_template.S"

ENDPROC(__copy_to_user)
ENDPROC(__copy_to_user_std)

.pushsection .fixup,"ax"
.align 0
Expand Down

0 comments on commit e814d82

Please sign in to comment.