From nobody Sat Jan 31 18:27:40 2026 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 4f3Lvw71mnz6Qg7t for ; Sat, 31 Jan 2026 18:27:40 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f3Lvw3rwzz41fK for ; Sat, 31 Jan 2026 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769884060; 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=kRrjXqOg+9Q/Mp974mHMlX9Ve7RsGhYR7vlA6OVnS/Y=; b=EtxuBGFVmWcvDPQYktxblLrzWmKCWVlp334pE76gtBUqSq2q+HS2/c4SYRmRGEe2pxW+lw Y8xcJWggfOojkl2vIgSU7fZThAp7wlfJojBVuUoUzO/0ZQAiI8IP011xoA8MJVgLeKoPE+ CBXTQRXYqXIjuRH5J1o3UTLw7KLUVF1WYBHS4IP0s8wim+zhyFs254H9dbXL8Yu3MGcpHW gHxm2MT5HaDMgjL1Fz1J0e2DLV07nlQlimlc0Ricqu826JbjZv5+YJ4aEuotiLc5cbnYYi 4EHIzQJbIs8khYYugh+QbA081e2z5gDr525OdGm7s0l3N9l6jkzwQ65cYqiBuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769884060; a=rsa-sha256; cv=none; b=TazMqrCC3Qa1djp/I7F2V0VUNSL+/HkeQv8spisKd565CXwBDnhRDe5d+dlFW6fR6UVMYo OGzPFGb/0O1IRyeyAjDRt+CmFEYR+EdF24skE+JDmgyp/vnpQMhFodMz6pvJO9JS/aZnbL CcNqdjvbj0RYvNwZnZns0KyN4akKHb+yF82pj2ZUvp54Y/xYAEl6CkWCq9/WsysMWDZ0HW MRLJmQP2hOHL8BaqJ7dOHeago9jlqZjpLGFoKapt3hTI1rqbz+GObHlEfgbnCyHKYQbCa5 b7BCbknPQJBzvA1e1vOppcODyohrrbVsOvLZQJM6d6yj0KuqAVw2IOOnd1oIuw== 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=1769884060; 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=kRrjXqOg+9Q/Mp974mHMlX9Ve7RsGhYR7vlA6OVnS/Y=; b=ojV2kNH8/eUBpdtLWGIAIjQRKmoN4ty67lrUcWIy/0J0oQ51zPLf+8xcz3CBgA8K7ZlJpI cE2Ys27l6b9T7pdNYVmXvUDLeIvV+RRlWyFWY4ZZkqlyvfVY8/Rl0jriwi8wDW47z0i76J t5rvquVkJGRoFosqamE7YPEDW7/guM/7myxTJUH93psxLuPUeB+OtH+b6g0G2n2waS7iQz sWcpo1Od6lDhpitaVpXS6cwoBoSBye7vsCFM+rg63UfC6xP337i9yP1R019I8g4gGzoLje 8DukxN9I5IU9vI4ZejJKBfm6z20NQIxLbtWqjH3EZPep+bqPEOt+OlUHTzOh3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3Lvw36Kpz15TL for ; Sat, 31 Jan 2026 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22628 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:27:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3b697f765d11 - stable/14 - nvme: Use proper prototype for SYSINIT functions 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b697f765d11535783f01c4e325c822374dce76d Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:27:40 +0000 Message-Id: <697e499c.22628.7b8e778e@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3b697f765d11535783f01c4e325c822374dce76d commit 3b697f765d11535783f01c4e325c822374dce76d Author: Zhenlei Huang AuthorDate: 2025-10-13 10:12:29 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 18:25:02 +0000 nvme: Use proper prototype for SYSINIT functions MFC after: 1 week (cherry picked from commit dd256c3fa738b6941f58355c077224c9a227b169) (cherry picked from commit 6edef6b6364162932379bd172930d82b067177cf) --- sys/dev/nvme/nvme.c | 4 ++-- sys/dev/nvme/nvme_sim.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index 25c93c2c99bc..26a0643057ef 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -52,7 +52,7 @@ int32_t nvme_retry_count; MALLOC_DEFINE(M_NVME, "nvme", "nvme(4) memory allocations"); static void -nvme_init(void) +nvme_init(void *dummy __unused) { uint32_t i; @@ -63,7 +63,7 @@ nvme_init(void) SYSINIT(nvme_register, SI_SUB_DRIVERS, SI_ORDER_SECOND, nvme_init, NULL); static void -nvme_uninit(void) +nvme_uninit(void *dummy __unused) { } diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 54cdc1e01f94..59c0225f1623 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -377,7 +377,7 @@ nvme_sim_controller_fail(void *ctrlr_arg) struct nvme_consumer *consumer_cookie; static void -nvme_sim_init(void) +nvme_sim_init(void *dummy __unused) { if (nvme_use_nvd) return; @@ -390,7 +390,7 @@ SYSINIT(nvme_sim_register, SI_SUB_DRIVERS, SI_ORDER_ANY, nvme_sim_init, NULL); static void -nvme_sim_uninit(void) +nvme_sim_uninit(void *dummy __unused) { if (nvme_use_nvd) return;