summaryrefslogtreecommitdiff
path: root/arch/alpha/lib/ev6-memset.S
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
commit62b8c978ee6b8d135d9e7953221de58000dba986 (patch)
tree683b04b2e627f6710c22c151b23c8cc9a165315e /arch/alpha/lib/ev6-memset.S
parent78fd82238d0e5716578c326404184a27ba67fd6e (diff)
downloadlinux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'arch/alpha/lib/ev6-memset.S')
-rw-r--r--arch/alpha/lib/ev6-memset.S12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/alpha/lib/ev6-memset.S b/arch/alpha/lib/ev6-memset.S
index 356bb2f..d8b94e1 100644
--- a/arch/alpha/lib/ev6-memset.S
+++ b/arch/alpha/lib/ev6-memset.S
@@ -30,15 +30,14 @@
.set noat
.set noreorder
.text
- .globl memset
.globl __memset
- .globl ___memset
.globl __memsetw
.globl __constant_c_memset
+ .globl memset
- .ent ___memset
+ .ent __memset
.align 5
-___memset:
+__memset:
.frame $30,0,$26,0
.prologue 0
@@ -228,7 +227,7 @@ end_b:
nop
nop
ret $31,($26),1 # L0 :
- .end ___memset
+ .end __memset
/*
* This is the original body of code, prior to replication and
@@ -595,5 +594,4 @@ end_w:
.end __memsetw
-memset = ___memset
-__memset = ___memset
+memset = __memset