From nobody Tue Jan 24 22:13:56 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 4P1h851W39z3bgck; Tue, 24 Jan 2023 22:13:57 +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 4P1h844zyZz3JwS; Tue, 24 Jan 2023 22:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598436; 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=slOLFMEhh9xkt/bNJSLS7q8kQFMmxBpmtiDN0HEP36A=; b=vLLIEOruC/B7B/AUenOp+k+98cyjflLY/1X18Xni6LWIqq6yv+ig552PqnPP7wGA3t/F1R Yn752wyA4QR3ZLePRiX6wgP9oN7spXBRdc7zzQZOHAHrOonGxN6OfpNXoHs+X4zF62v5ki qUvw0r4LOt3vxMswkfKZZNQ1Emnh7GfT4fUR/uYZAlalVlzW1/EziOuFPaRrjQMUW2MMu1 rhjYWTsYQJDurMmXhLVE6cWaFuA1Viklo4Oocv335PZjP3z0vK1lFM/4Wnod88wPbB9EiT IGmv6FDTjrj4i5L+XBdmw7Bych6S5trMyjYM28ZevBJu7Ua0yRNjlLGjApJkiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598436; 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=slOLFMEhh9xkt/bNJSLS7q8kQFMmxBpmtiDN0HEP36A=; b=cGSLb6qwl7BZyQ0Ln+PcQIlas0mlJPq/LiT9N5u7mkCLxTOpnCgvZySyGQwtavBmQbOhl6 8IHofI/IKUABbpHVlsZjXQ4F9zu9l8W/B7V9bO+7cx+vDlJMVi35V/4VkFe9bweI9vgQtK TArRQqtg1Sn6dP1KOEhxi09sGqlNgmZ1BEFZRnUtg4VLe+WYDqyIUWeQPbJwtdiVnNwhWM LNRKHPPaudOp1tmflUBIbaFOJ8i/jFtgbmhSFl/rHpDVFuJsZUCXZMMj0roV6la88knm/z 1XlAcT67p0it0ZyFw5xnKgnm+Eh5IX814N9YeirYgwJAIjySJanMjbSsnifbPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598436; a=rsa-sha256; cv=none; b=xFgchbO2LbctWeA8W/vtpk0dnOm4KjfL0WhZL8osF2djyrMIA9IQAJG3jJMufqKw9bd0qw XXP+ZJWEg2ZfIlgijqTBWG7NR3gEpbmlnEJ3C75TzwE7roLgB+SIDLc0/ADjNN3a164IAH bj0Jjs30bMwhEGfN68Yn08T6JeUhc2y1v/sscnu1+85NfyZSsyLm0bRoWZzRGUqbJLRhJV iMchQl9/OWlEI1N0by2a932OokoDOJ3XvdmDOXMKIzu/M1ZBFAhpy6r2/0Ov0g793NTetf aUPwp/OwaDoU11O4nvT2TYvDR25eJ1YyTG2bo+L84Bpel3BtZs9gOuNZyOi/dg== 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 4P1h84464nzQYx; Tue, 24 Jan 2023 22:13:56 +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 30OMDuEZ089131; Tue, 24 Jan 2023 22:13:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDub3089130; Tue, 24 Jan 2023 22:13:56 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:56 GMT Message-Id: <202301242213.30OMDub3089130@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: d0288b18fbac - stable/13 - stand: update prototypes for md_load and md_load64 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: d0288b18fbacfc7d4a92be28568accb46a49cb60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d0288b18fbacfc7d4a92be28568accb46a49cb60 commit d0288b18fbacfc7d4a92be28568accb46a49cb60 Author: Warner Losh AuthorDate: 2022-12-05 17:40:15 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:43 +0000 stand: update prototypes for md_load and md_load64 These are declared as extern in a number of files (some with the wrong return type). Centralize this in modinfo.h and remove a few extra stray declarations as well that are no longer used. No functional change. Note: I've not tried to cope with the bi_load() functions which are the same logical thing. These will be handled separately. Sponsored by: Netflix (cherry picked from commit 335615c4cad79765b46048bfa782120fd9cadb95) --- stand/common/modinfo.h | 3 +++ stand/efi/loader/arch/arm/exec.c | 1 - stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 3 +-- stand/libofw/libofw.h | 4 ---- stand/powerpc/ofw/elf_freebsd.c | 1 + stand/powerpc/ofw/ppc64_elf_freebsd.c | 1 + stand/uboot/arch/powerpc/ppc64_elf_freebsd.c | 5 +---- stand/uboot/elf_freebsd.c | 3 +-- 8 files changed, 8 insertions(+), 13 deletions(-) diff --git a/stand/common/modinfo.h b/stand/common/modinfo.h index e4739df0b68f..967367beeeb0 100644 --- a/stand/common/modinfo.h +++ b/stand/common/modinfo.h @@ -6,6 +6,9 @@ #ifndef COMMON_MODINFO_H #define COMMON_MODINFO_H +int md_load(char *args, vm_offset_t *modulep, vm_offset_t *dtb); +int md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); + vm_offset_t md_copymodules(vm_offset_t addr, bool kern64); vm_offset_t md_copyenv(vm_offset_t addr); diff --git a/stand/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c index a110f3d07cbc..2fecb2ea043a 100644 --- a/stand/efi/loader/arch/arm/exec.c +++ b/stand/efi/loader/arch/arm/exec.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "loader_efi.h" -extern vm_offset_t md_load(char *, vm_offset_t *); extern int bi_load(char *, vm_offset_t *, vm_offset_t *, bool); static int diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c index 5851d71fdc13..3341771be09a 100644 --- a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "syscall_nr.h" #include "host_syscall.h" +#include "modinfo.h" extern char end[]; extern void *kerneltramp; @@ -55,8 +56,6 @@ struct trampoline_data { uint32_t mdp_size; }; -vm_offset_t md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); - int ppc64_elf_loadfile(char *filename, uint64_t dest, struct preloaded_file **result) diff --git a/stand/libofw/libofw.h b/stand/libofw/libofw.h index dc520d741290..2d6ea9a5bf24 100644 --- a/stand/libofw/libofw.h +++ b/stand/libofw/libofw.h @@ -69,10 +69,6 @@ int ofw_common_parsedev(struct devdesc **dev, const char *devspec, const char ** struct preloaded_file; struct file_format; -/* MD code implementing MI interfaces */ -vm_offset_t md_load(char *args, vm_offset_t *modulep, vm_offset_t *dtb); -vm_offset_t md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); - extern void reboot(void); struct ofw_reg diff --git a/stand/powerpc/ofw/elf_freebsd.c b/stand/powerpc/ofw/elf_freebsd.c index 89811e965d6e..ee173d55e25c 100644 --- a/stand/powerpc/ofw/elf_freebsd.c +++ b/stand/powerpc/ofw/elf_freebsd.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libofw.h" #include "openfirm.h" +#include "modinfo.h" extern char end[]; extern vm_offset_t reloc; /* From /conf.c */ diff --git a/stand/powerpc/ofw/ppc64_elf_freebsd.c b/stand/powerpc/ofw/ppc64_elf_freebsd.c index 38c664228c12..ece3dbc6d822 100644 --- a/stand/powerpc/ofw/ppc64_elf_freebsd.c +++ b/stand/powerpc/ofw/ppc64_elf_freebsd.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libofw.h" #include "openfirm.h" +#include "modinfo.h" extern char end[]; extern vm_offset_t reloc; /* From /conf.c */ diff --git a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c index 57b2e791fbba..feabcde3bf4a 100644 --- a/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c +++ b/stand/uboot/arch/powerpc/ppc64_elf_freebsd.c @@ -40,10 +40,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libuboot.h" - -vm_offset_t md_load64(char *args, vm_offset_t *modulep, vm_offset_t *dtb); -extern char end[]; -extern vm_offset_t reloc; /* From /conf.c */ +#include "modinfo.h" int ppc64_uboot_elf_loadfile(char *filename, uint64_t dest, diff --git a/stand/uboot/elf_freebsd.c b/stand/uboot/elf_freebsd.c index 802d6e96dee6..0541edd92c64 100644 --- a/stand/uboot/elf_freebsd.c +++ b/stand/uboot/elf_freebsd.c @@ -39,8 +39,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libuboot.h" - -extern vm_offset_t md_load(char *, vm_offset_t *, vm_offset_t *); +#include "modinfo.h" int __elfN(uboot_load)(char *filename, uint64_t dest,