From nobody Wed Aug 31 11:32:52 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MHhqn1h19z4b5wl; Wed, 31 Aug 2022 11:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MHhqn138bz4H90; Wed, 31 Aug 2022 11:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661945573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVhj1pzPxp8Y9ZdSiB2x8wdGs7ZP1E4l39aPtbd954c=; b=CeAUybqr6Mu1pXhD1hS0rbz1p2ULoG3mHNdeqtZvAcEbbZFOBB+XIDzFWSKR0rTMM2KCmF eTYtuywU9Pvo6YOHLnglL8GYr0GVoNRyD8veNYhRAR3cdVgbv5k9Nf17rZA6LDSnqq91jR haeYcdwG0n6vuYRxtjl8f180T2SOjpaiHeDmHZjuolHAQJauI0fCUwyQO3EKQxRe1Ek4I2 x5aZz3tb2ZtrLJfS43YeeeXmiityl/6HQZFx3lKDfDVtRzN4T98wFOplFhcIhgxPaEEI9e CgrXmOxRGJUSOxE03idT3PCxJ/u/zsGhOW/ranj0ziISor6SrYc16P/HC+zzew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MHhqn05d4z16W6; Wed, 31 Aug 2022 11:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27VBWqfL078286; Wed, 31 Aug 2022 11:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VBWqs4078285; Wed, 31 Aug 2022 11:32:52 GMT (envelope-from git) Date: Wed, 31 Aug 2022 11:32:52 GMT Message-Id: <202208311132.27VBWqs4078285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 06bf97791a90 - stable/13 - i386/exception.s: fix mismerge List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06bf97791a909a7e31721d641a18145852ed687e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661945573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MVhj1pzPxp8Y9ZdSiB2x8wdGs7ZP1E4l39aPtbd954c=; b=A7lL65vh1QNVvGKEAHjwe6LM7T7NnS79DYu592tDvnjMZ9qHgEcTVe2ADTZfy2U4I/2zyu kPmgSYVj+VWxkOM+B5ZwkTp8cpCfZ5Xi6oYHAOeIj/V69f7acqI9+WYkwVNW6raRXeI6UT Zk518AohEej+mQPRlWKdgHt2ITB0GJFbUS03JzL8VrDZUjbp3zVI/acZ5DhnlUDmVgkBJ7 BsvKkrGVdQ/2iRzhAMYjwt2uY6xrd7xvQ93C/AJCNKygmWAGLiSlIU4iutT6AQ6dEbTdfV bVBPrsLucvsDKaT559HRUcgOVyLTzHD84aOTq6k58wC4ySssL9OaKJh24A9VNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661945573; a=rsa-sha256; cv=none; b=xVMmCMC8xIIOCU+yn+XKCgGbNtkAxr2+2nBZpVoo+HDgva2UXY/UxB7FIqhf98vZYcJpYo 9pG0C5fQ/tQsIfBACEEiwNoTgiMMTpX4OWpmlNT6cpc1RLEsgdgtWHEi+/R6zjZOchTcF/ Dy/xvkkw3djF4VFWJz7fV/UnqtuTQ3L1iAI/xaVxG9d5T3GGVslYjVpbmySh+IxneXxvRo WjbkFS3EYkQLSJavA7hLIDL7Y4hihKCrSDbSLV1/fzZYRdqtJjdPnCKUgWwRh7jG5/NJHR sX6/xe2hjbQnLkBkNWd/WTkyH238nrvKj2v+03BpD/oBNdqC7GT2XtXQhzo0RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06bf97791a909a7e31721d641a18145852ed687e commit 06bf97791a909a7e31721d641a18145852ed687e Author: Konstantin Belousov AuthorDate: 2022-08-31 11:32:08 +0000 Commit: Konstantin Belousov 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