From nobody Mon Sep 23 13:03:41 2024 X-Original-To: dev-commits-src-all@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 4XC38Z2khQz52FTy; Mon, 23 Sep 2024 13:03:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XC38Z14bcz40SV; Mon, 23 Sep 2024 13:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096622; 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=7Ahnsxgnc2CMh2z/zTa6u0Oe3tveStCGdZRnJUCt3t0=; b=U60IxjlH41DGlIDkOIlnrn4vBaXbZwrwFosc70Cwhb+1CSCl4NuNxMz3df9o99/4dPVgBp zJj6qgL3mPa3JIdGahCNLEXoU+fJHaeEf9i62EhTs+f7SH5w9zy9M5/a1wEfTShZ1lLQkA KfHUGpmTB0pVz9keCUog0lJD3M9hFyLA5zQfLtlUqlU3ssYzzff9NyNk47bYVMfo51bYk4 dtFeLVa5b0wffSjg4XTnfQr+GNsPqhrVODK3nNVoSB+kHx+JwzhRzafsCtYYF0tMuHhNoe tTgKbdGh17qcJgFU6EyF5SiVhnK9fW5Qc0r/wKGxQb2V3QqC7J8xqUUvtSRdYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727096622; a=rsa-sha256; cv=none; b=uzbMe+9kCIqcyA7Ue2lU0TFCRqdqvWgUMEG5xhttWFIJ2wGRzBiiyDdzmvbjMGl9RTdami 40gwjYCDfSfTDlB46KQsqaEIfbEdZlZPrnLcyKP1KowDmXbVcnPnrK9uUxeghqOkvDSrDg 6nBWRCrvBRbFtjnrgPpLc28zzTUNmI+oEIyonLg+OWmYJpqt4uUePiz5uDB9+im41q8RU8 DthT9ah/Ad0YPXGDxmrwkjeQttvGsMaZLSMvnujWEF5PfcUn0a8b1FMfmLnvv/JRH/wIt0 8vVfWPOoEFFIKj4iMaEM66E7fzYA5hIqogv2iWEY8m21UGqjhtNhGKDktUr23A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096622; 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=7Ahnsxgnc2CMh2z/zTa6u0Oe3tveStCGdZRnJUCt3t0=; b=RdLQclhOh0g9PnOLkIHRcFRIyUVR6kDB9IkvbXycKxIua4xGW+iIp6E/Fm/yMKBEqlUG6i 5ynEjoH23ENYKPrwfWDrAFvkSmeVD/34amCr2zI9RQuPnVKTRdSjpJrQZUKd/BKP9/biJv OEDt5mjPaOtxv/yonEc1fcpbYLwHOBeKOUdaHsarQ1sEMrIfM29HJK2Krn8NsKwaoePzMK Zk9HcFwTxkc1YKwoKdHtt5AO7n4PP6xYc/zyGPjxdqy2UM4xeRHOjesvZrqMLChwPRQBTw zWjPmSDZZuxQp62VYO5vdpuGSeQmrtftoq87xVvvT05+xZRza/SDM8v+1FTSQg== 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 4XC38Z0h6TzldK; Mon, 23 Sep 2024 13:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48ND3ffk006949; Mon, 23 Sep 2024 13:03:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ND3fIG006946; Mon, 23 Sep 2024 13:03:41 GMT (envelope-from git) Date: Mon, 23 Sep 2024 13:03:41 GMT Message-Id: <202409231303.48ND3fIG006946@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: 8179f2a7753d - stable/14 - amd64 la57_trampoline: jump immediately after re-enabling paging List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 8179f2a7753d51767d7dcaae53f8ba0d1dcdf8db Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8179f2a7753d51767d7dcaae53f8ba0d1dcdf8db commit 8179f2a7753d51767d7dcaae53f8ba0d1dcdf8db Author: Konstantin Belousov AuthorDate: 2022-09-17 01:35:20 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-23 13:03:06 +0000 amd64 la57_trampoline: jump immediately after re-enabling paging (cherry picked from commit 180c8ab079950acb15c6629ce293055ea0117b39) --- sys/amd64/amd64/locore.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index e52d36125afd..a51e5047fe54 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -119,8 +119,9 @@ l1: movl $(3<<3),%eax movl %edi,%cr3 movl %edx,%cr0 + jmp 1f - pushl $(1<<3) +1: pushl $(1<<3) pushl %ebx lretl .code64