From nobody Tue Jan 24 22:13:39 2023 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 4P1h7l4x4Gz3bgb4; Tue, 24 Jan 2023 22:13:39 +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 4P1h7l3zscz3HhS; Tue, 24 Jan 2023 22:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598419; 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=MgbUEPTLFKunHSBvrd54kq21fOe1Zqhohh7umrVai9g=; b=xsoCYoEjCFymtXp6DspzqwXefFVo3d4ckVVQFZMh6FgNwB1e1F3Za+/SG2kZoYSCbl5Shm pb8LyTqWggWNb9wzad/W24pGSMobrUWYLSejhKm5JJHUr4xQm0go4BkYJQzcus9Hn65OhT CREJ59k3zhFpZqoNCp60wRPW38EkiXQ2WASekt2Ij4flveIdRRNGd7aJvUDehR8OmYHk95 XDEkWN2wVSBezIkLtw98Fyg0VdLGRqWl+6LudS+ZagPhiQBCerh8uOOW+UDqf/wbWweroP tvm4TJ07RgfcuXwLXxYMaZVIeVtZLa2DhMGW4fXqqw27Jz7NfeYDiei2tbL3Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598419; 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=MgbUEPTLFKunHSBvrd54kq21fOe1Zqhohh7umrVai9g=; b=lPvJUN0kymShp0kvfC+zHqIu7Bk3PnGNcMSt4w03hCbYWlTZL9UMi499bx8cqhqjb2hDHs cPpDmJmjFk7aaTWJLvF71e33dvZM4o4VZZOBhvPrkRONH86J7xcRcqFlS0oG34rkisXLq5 qyEeGb/Qt3w4ZLh894NwSHHkGTGM5BMfLLLXcT+ORlWH32KJtd8Utgsp65t8M3McbjAb6b ClP54KLRMq2kV8ybZK9pxsVFhD/0p7PZrFCoVoClNdqquHznRVsWzX4csBYqauDA+mTf3B 0h6A3bmgjPqCI75NDwtcqxqOHwGRLH4YOewzKdom5DnuNoxaNRB2kMo+zRQHoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598419; a=rsa-sha256; cv=none; b=ssAnvIbpVqP0VczTcw9yUzx38LCokcmiO1tUe4QcrYMBUbXJEPGFwTK7+iXQPbaDu/uyma kMEpUFPYeCqCoh/PPx6yB1vKT0MQ+QGqZQXAE13utkrPWl1vkl9JZNbWN89yMZDmF7hHFj sT6d++j44RliuDD7odYjJKoZam8NzaqfH1GK4vsQZCbaHPd7llW7etFd/Mf7ezrtXa9S7P DzsjXIsFHeCHN893BZlOGdGE/0PzfFTf+bH8LHD5qiEtA0TsOTouxQuwCeP+WusTcYIZAT VV9fwaix0+bbs4CGDNhtnf6ZFPWrNnjA589algapaCZe8S8DsytPPnhykGsGlA== 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 4P1h7l3025zQh8; Tue, 24 Jan 2023 22:13:39 +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 30OMDdeD088733; Tue, 24 Jan 2023 22:13:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDdqY088732; Tue, 24 Jan 2023 22:13:39 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:39 GMT Message-Id: <202301242213.30OMDdqY088732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d716a23cabf4 - stable/13 - kboot: Move archsw init earlier 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d716a23cabf4b390eb70494d7c022ab189cfb4ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d716a23cabf4b390eb70494d7c022ab189cfb4ef commit d716a23cabf4b390eb70494d7c022ab189cfb4ef Author: Warner Losh AuthorDate: 2022-12-03 19:48:11 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:41 +0000 kboot: Move archsw init earlier Do archsw init first thing. Sponsored by: Netflix (cherry picked from commit a2fbc8859361c7bac7823c0a1978c78df11bc81d) --- stand/kboot/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index 3b2c43c20a0f..7826e06c653f 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -83,6 +83,14 @@ main(int argc, const char **argv) const size_t heapsize = 15*1024*1024; const char *bootdev; + archsw.arch_getdev = kboot_getdev; + archsw.arch_copyin = kboot_copyin; + archsw.arch_copyout = kboot_copyout; + archsw.arch_readin = kboot_readin; + archsw.arch_autoload = kboot_autoload; + archsw.arch_loadaddr = kboot_loadaddr; + archsw.arch_kexec_kseg_get = kboot_kseg_get; + /* Give us a sane world if we're running as init */ do_init(); @@ -107,14 +115,6 @@ main(int argc, const char **argv) printf("Boot device: %s with hostfs_root %s\n", bootdev, hostfs_root); - archsw.arch_getdev = kboot_getdev; - archsw.arch_copyin = kboot_copyin; - archsw.arch_copyout = kboot_copyout; - archsw.arch_readin = kboot_readin; - archsw.arch_autoload = kboot_autoload; - archsw.arch_loadaddr = kboot_loadaddr; - archsw.arch_kexec_kseg_get = kboot_kseg_get; - printf("\n%s", bootprog_info); setenv("currdev", bootdev, 1);