Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df6f705 authored by David Mosberger-Tang's avatar David Mosberger-Tang Committed by Tony Luck
Browse files

[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: default avatarDavid Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 512f6429

arch/ia64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ GLOBAL_ENTRY(ia64_ret_from_ia32_execve) 
	st8.spill [r2]=r8	// store return value in slot for r8 and set unat bit

	.mem.offset 8,0

	st8.spill [r3]=r0	// clear error indication in slot for r10 and set unat bit

END(ia64_ret_from_ia32_execve_syscall)

END(ia64_ret_from_ia32_execve)

	// fall through

#endif /* CONFIG_IA32_SUPPORT */

GLOBAL_ENTRY(ia64_leave_kernel)

arch/ia64/lib/memset.S

+1 −1
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ GLOBAL_ENTRY(memset) 
{ .mmi

	.prologue

	alloc	tmp = ar.pfs, 3, 0, 0, 0

	.body

	lfetch.nt1 [dest]			//

	.save   ar.lc, save_lc

	mov.i	save_lc = ar.lc

	.body

} { .mmi

	mov	ret0 = dest			// return value

	cmp.ne	p_nz, p_zr = value, r0		// use stf.spill if value is zero