From nobody Wed Oct 16 14:32:07 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 4XTD2070pzz5YbQS; Wed, 16 Oct 2024 14:32:08 +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 4XTD201xlfz4Rhv; Wed, 16 Oct 2024 14:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729089128; 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=uJL+BLJKkG6FGqxfIsTys+NPT2cuVJkRFhRfwfiJru4=; b=YyLMChvXBkWuRI+LQQNzhzEe9N4K7fryHvDp/l9mmSPR0QPopMFzgEIG17KXpcgRN7TjcX vVEG0MW+Ox+9k1fnh6yjEcTYSoOacqmjFn+YvjKDFM30X/iVugCMDMTLB/3E8QMEEm74Nb SoaAXE0DgZt2CJFQsw2dXYfqkLo73NZBXhrjAItKO85/Zhp4U4itPgT6XjJ0qYiHB8SuKK FPZ89Uqz4E79FGYOEsRB/ul29i6rYs1DUHp+etHNpM7RLlQogpjjXJxL3GAQmDYeASLXr/ cfSp53QVjiEWthWTx9uCyPqqePug3WFUKlUjr+fFCfjxz2l+PU2ExDqAG9GQ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729089128; 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=uJL+BLJKkG6FGqxfIsTys+NPT2cuVJkRFhRfwfiJru4=; b=rSmbTLkdw0UgkojYoPlbSVyf/6RErUgukrqRdfviSbvNQ6L9Cn5Y02/qDm5nMJ69ImmhsF /71W4+LLpbXnpLaJfLu4+f3UZ9nVcnM0hujoRL4Badg5JZlkHkgTY2iitt+ss0FdgpqEDJ ZEQAacsqQlxKZ7G5GwcSEBtFldg642gzab1itEYPd1jl2FiODLK0eMjB+HTTvZFpF+Vwyv j5oeJnikPpeU6ClC48FCYzY5sxRW2frGZlqZZ5k5i5m5YN/VGV9Dwk8hgNN63ekAkXh7FE 96cYU7rlwwMmVPHB/HgIYvAl59ZHEuIUux5XT99EHk8XpSMZBAzZWX63UXgU/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729089128; a=rsa-sha256; cv=none; b=NvLduTPBH++oVP7jOSJBVzYuHHlCofOlYh91Oq5X7XLk75xg9VSbKA58xO0Zun6mR804+T 4QCbwgptMNvK3Z4mpE5cw0iFy886od4OOxH+6aVZ7zOpvYo31tq/BI0PlS5Y/M4sxIEJJO 26mA+wEICwD01KxxZQX9q4IoIsLiTpHKSpA4jJ97/FrgZds0zEKxYZmp93BstZP4Qvsain tN1C3AYqPfkUkSvd1TVO5ehEL915e8dbaay/FUAmm1cEIUH4j2sQG57MOKDvvV8RZqogwt XZlHHADQEO+uC/qbPihK06lsL0tdH0WmBjdDrAghCi0Br+4zUD9rtsaGaTQLqA== 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 4XTD1z6XXPz1895; Wed, 16 Oct 2024 14:32:07 +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 49GEW7lM089750; Wed, 16 Oct 2024 14:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49GEW7PE089747; Wed, 16 Oct 2024 14:32:07 GMT (envelope-from git) Date: Wed, 16 Oct 2024 14:32:07 GMT Message-Id: <202410161432.49GEW7PE089747@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: d36ba3989ca9 - stable/14 - firmware: unbreak armv7 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d36ba3989ca9fb684f51a300714fadbe82cb59d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d36ba3989ca9fb684f51a300714fadbe82cb59d6 commit d36ba3989ca9fb684f51a300714fadbe82cb59d6 Author: Warner Losh AuthorDate: 2024-02-29 17:53:05 +0000 Commit: Warner Losh CommitDate: 2024-10-16 14:19:21 +0000 firmware: unbreak armv7 Use proper format specifiers (with casts) and don't redefine flags. Fixes: c7b1e980ae16 Sponsored by: Netflix (cherry picked from commit 3a3afbec3860b0eb4178b63713ca12bd223b585a) --- sys/kern/subr_firmware.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_firmware.c b/sys/kern/subr_firmware.c index 94538670e38c..e8f9493decc0 100644 --- a/sys/kern/subr_firmware.c +++ b/sys/kern/subr_firmware.c @@ -279,7 +279,7 @@ try_binary_file(const char *imagename, uint32_t flags) struct vattr vattr; void *data = NULL; const struct firmware *fw; - int flags; + int oflags; size_t resid; int error; bool warn = flags & FIRMWARE_GET_NOWARN; @@ -296,8 +296,8 @@ try_binary_file(const char *imagename, uint32_t flags) printf("Trying to load binary firmware from %s\n", fn); NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, fn); - flags = FREAD; - error = vn_open(&nd, &flags, 0, NULL); + oflags = FREAD; + error = vn_open(&nd, &oflags, 0, NULL); if (error) goto err; NDFREE_PNBUF(&nd); @@ -311,8 +311,8 @@ try_binary_file(const char *imagename, uint32_t flags) * Limit this to something sane, 8MB by default. */ if (vattr.va_size > firmware_max_size) { - printf("Firmware %s is too big: %ld bytes, %ld bytes max.\n", - fn, vattr.va_size, firmware_max_size); + printf("Firmware %s is too big: %lld bytes, %ld bytes max.\n", + fn, (long long)vattr.va_size, (long)firmware_max_size); goto err2; } data = malloc(vattr.va_size, M_FIRMWARE, M_WAITOK);