diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /arch/ia64/lib/memset.S | |
parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'arch/ia64/lib/memset.S')
-rw-r--r-- | arch/ia64/lib/memset.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/lib/memset.S b/arch/ia64/lib/memset.S index bd8cf907fe22..f26c16aefb1c 100644 --- a/arch/ia64/lib/memset.S +++ b/arch/ia64/lib/memset.S | |||
@@ -57,10 +57,10 @@ GLOBAL_ENTRY(memset) | |||
57 | { .mmi | 57 | { .mmi |
58 | .prologue | 58 | .prologue |
59 | alloc tmp = ar.pfs, 3, 0, 0, 0 | 59 | alloc tmp = ar.pfs, 3, 0, 0, 0 |
60 | .body | ||
61 | lfetch.nt1 [dest] // | 60 | lfetch.nt1 [dest] // |
62 | .save ar.lc, save_lc | 61 | .save ar.lc, save_lc |
63 | mov.i save_lc = ar.lc | 62 | mov.i save_lc = ar.lc |
63 | .body | ||
64 | } { .mmi | 64 | } { .mmi |
65 | mov ret0 = dest // return value | 65 | mov ret0 = dest // return value |
66 | cmp.ne p_nz, p_zr = value, r0 // use stf.spill if value is zero | 66 | cmp.ne p_nz, p_zr = value, r0 // use stf.spill if value is zero |