From nobody Mon May 26 15:33:31 2025 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 4b5ftN2vWmz5wBXH; Mon, 26 May 2025 15:33:32 +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 4b5ftM4H0Mz438G; Mon, 26 May 2025 15:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273611; 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=mURFR9IPVVka/vVd85/HCH3u2UA0wIQypu+2p3bOCnQ=; b=X7QvVqOai0NBixi2zeKB5L96fr9jQgcBfQXexoLCn48l/qmifTNJpNNqRol76fikvEjKJ0 THYJj0s7d/OhO7kx5BV7oP4Esa63rQ1eeDJoT/8Gt/BDhjX+mVa8ldaW87jGwiHB6ili/W z1XxYrUpOvaMSwGu0m7JEYpIHIF7OpwIuNOkmF98fruoRnlcH2Gc9/hcE/W/lA3xFDfoTT FLQ+pEnh/rrrCuWATf9xQsZEOw6HTC7Le1Mi5pwgDiCjJ3iclhHW09dpedQjMV3EQtQSFT Qzx1CC7bzGHsZwqbWnHHD8ML6rVOpuvqSIIXHhrcvrUtf1Uhjdw6QqSAJETzRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273611; 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=mURFR9IPVVka/vVd85/HCH3u2UA0wIQypu+2p3bOCnQ=; b=SZmJp4W5kR3ScAokjGyEw4KqMAuzUtYOm5cZ2kC0db/xQ5DKNaGLI5M9DvRZbgLryHCZ9M jotwvL+kQq2jgf2+58bbURBpH8xReJ9Ed0aFXKXl/3TRoCZ1W+9KPeVwcvWNzOWlXqhC8L 9DAtPpVJ/8x7EHSqAEJA1HSB4rNV9sf1YXXJIJN3vvy9TI+iexlweQql4AWMq/S+nfWZ5i MEnUJTE3eZP+cy58cPx7d6g9IfN4air1MWXOPha/+NDSqy4f28w4eqG3OiSiHSusqNi9Yo zrOsv/CqjVa0NaEVTnqrdw9dGsvYvNfYkC06y40f9COKUqv0/J1jPKAcav0r4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273611; a=rsa-sha256; cv=none; b=XmE+wOhurqLQinVbDT2Suoc9ANTxqVYCa9m+b9AVmMEKpdb85M91YqEtb8BQGeEK+bCGdM +87CDpshcHrEGcWsNl7TCOwuo1qWdakiDGz7k0zzoGWdYnP0nEVZyjDaKmCSdhfRCAKXJJ KkR4/DiuCUeW4QPHwgMHkoXcuzmqFlJnnA4jgTvYUJFV0N8I2qH5aJ+sAv237RB1N2qqz7 zeU98gpXe10YRYuL7SrNUyd4t3H4w+Vegr1K/pdHOjLs6t/nlOOxxklLN8O4o0/0CnDjaj CVLHgkTkMVpNWGZMExah+VYgqJdU+sTOu6ISzvhd1LId9TvuLo+SmTt/Z8MazA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b5ftM3t4Xz1BFC; Mon, 26 May 2025 15:33:31 +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 54QFXV2w045009; Mon, 26 May 2025 15:33:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXV7a045006; Mon, 26 May 2025 15:33:31 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:31 GMT Message-Id: <202505261533.54QFXV7a045006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7429d6158ca9 - main - kboot: Initialize archsw at compile time 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7429d6158ca91195b30c807127b4758424887128 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7429d6158ca91195b30c807127b4758424887128 commit 7429d6158ca91195b30c807127b4758424887128 Author: Warner Losh AuthorDate: 2025-05-25 15:17:53 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 kboot: Initialize archsw at compile time No need to initialize this at runtime. This trades .bss space + code in .text for just .data and is net smaller. Sponsored by: Netflix --- stand/kboot/kboot/main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stand/kboot/kboot/main.c b/stand/kboot/kboot/main.c index 5b7bfa246f55..668e5ac2706d 100644 --- a/stand/kboot/kboot/main.c +++ b/stand/kboot/kboot/main.c @@ -37,9 +37,6 @@ #include "stand.h" #include -struct arch_switch archsw; -extern void *_end; - int kboot_getdev(void **vdev, const char *devspec, const char **path); ssize_t kboot_copyin(const void *src, vm_offset_t dest, const size_t len); ssize_t kboot_copyout(vm_offset_t src, void *dest, const size_t len); @@ -47,6 +44,16 @@ ssize_t kboot_readin(readin_handle_t fd, vm_offset_t dest, const size_t len); int kboot_autoload(void); static void kboot_zfs_probe(void); +struct arch_switch archsw = { + .arch_getdev = kboot_getdev, + .arch_copyin = kboot_copyin, + .arch_copyout = kboot_copyout, + .arch_readin = kboot_readin, + .arch_autoload = kboot_autoload, + .arch_zfs_probe = kboot_zfs_probe, +}; +extern void *_end; + extern int command_fdt_internal(int argc, char *argv[]); /* @@ -346,13 +353,6 @@ main(int argc, const char **argv) const size_t heapsize = 64*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_zfs_probe = kboot_zfs_probe; - /* Give us a sane world if we're running as init */ do_init();