Commit e814d826 authored May 07, 2010 by Catalin Marinas Committed by Russell King May 08, 2010

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: 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>

parent b8349b56

arch/arm/lib/clear_user.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/lib/copy_to_user.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -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