Date: Wed, 31 Aug 2022 11:32:52 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 06bf97791a90 - stable/13 - i386/exception.s: fix mismerge Message-ID: <202208311132.27VBWqs4078285@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06bf97791a909a7e31721d641a18145852ed687e commit 06bf97791a909a7e31721d641a18145852ed687e Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2022-08-31 11:32:08 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2022-08-31 11:32:33 +0000 i386/exception.s: fix mismerge --- sys/i386/i386/exception.s | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 4e347642cc0f..38ec48e66e24 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -251,7 +251,6 @@ irettraps: cmpl %edx, TF_EIP(%esp) jne calltrap movl $(2 * TF_SZ - TF_FS - 8), %ecx - jmp 6f 5: cmpl $PMAP_TRM_MIN_ADDRESS, %esp /* trampoline stack ? */ jb calltrap /* if not, no need to change stacks */ movl (tramp_idleptd - 1b)(%ebx), %eax
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208311132.27VBWqs4078285>