diff options
author | David Mosberger-Tang <davidm@hpl.hp.com> | 2005-03-25 02:16:00 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-05-03 13:56:42 -0400 |
commit | 9df6f705c0934a49d0f0a3468a5b5044c8aec4f1 (patch) | |
tree | 045807d5f55b61d6222c6dada311237a9badeddc /arch/ia64 | |
parent | 512f64295f2f0049515dcc4e97c1f1ae0df9629c (diff) |
[IA64] fix typos caught by new assembler
Patch below fixes 3 trivial typos which are caught by the new
assembler (v2.169.90). Please apply.
[Note: fix to memcpy that was also part of this patch was separately
applied from patches by H.J. and Andreas ... so the delta here only
has the other two fixes. -Tony]
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/ia64/lib/memset.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index d3f093820bc7..81c45d447394 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -782,7 +782,7 @@ GLOBAL_ENTRY(ia64_ret_from_ia32_execve) | |||
782 | st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit | 782 | st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit |
783 | .mem.offset 8,0 | 783 | .mem.offset 8,0 |
784 | st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit | 784 | st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit |
785 | END(ia64_ret_from_ia32_execve_syscall) | 785 | END(ia64_ret_from_ia32_execve) |
786 | // fall through | 786 | // fall through |
787 | #endif /* CONFIG_IA32_SUPPORT */ | 787 | #endif /* CONFIG_IA32_SUPPORT */ |
788 | GLOBAL_ENTRY(ia64_leave_kernel) | 788 | GLOBAL_ENTRY(ia64_leave_kernel) |
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 |