From e3ad6167a584a0727628c49530f5430b4bce3be3 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 7 May 2010 10:52:32 +0100 Subject: [PATCH] --- yaml --- r: 190882 b: refs/heads/master c: e814d826dc1821dbce3aa1ddb7f2f739f420ffd8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/lib/clear_user.S | 1 + trunk/arch/arm/lib/copy_to_user.S | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3ed9dab0f15..8463e90eeb94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8349b569aae661dea9d59d7d2ee587ccea3336c +refs/heads/master: e814d826dc1821dbce3aa1ddb7f2f739f420ffd8 diff --git a/trunk/arch/arm/lib/clear_user.S b/trunk/arch/arm/lib/clear_user.S index 5e3f99620c04..14a0d988c82c 100644 --- a/trunk/arch/arm/lib/clear_user.S +++ b/trunk/arch/arm/lib/clear_user.S @@ -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 diff --git a/trunk/arch/arm/lib/copy_to_user.S b/trunk/arch/arm/lib/copy_to_user.S index 027b69bdbad1..d066df686e17 100644 --- a/trunk/arch/arm/lib/copy_to_user.S +++ b/trunk/arch/arm/lib/copy_to_user.S @@ -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