From nobody Thu Jun 08 16:30:54 2023 X-Original-To: dev-commits-src-main@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 4QcV7y44ndz4byFb; Thu, 8 Jun 2023 16:30:54 +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 4QcV7y353Cz3HFH; Thu, 8 Jun 2023 16:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686241854; 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=lIs8K6P79OYPy6mRgqxsCpoey6dqYHHFyRy+ovzC8yM=; b=Esd1iwI3Q3fjF5HCNngIAv1qfXXzX+vExS7EGMRpaBKkcTkXI6RR4QLL+y4EGQATrsbct2 lekoxMeTHvZ1QwEUflHfFreDnCr1PyWrwz7HGsfcMA9ksPnaMrRX/75j54FS9dZ+lGqyZv bbn0Iuar3tOUfXx0VBjKf3IbxBgDjdQWam5rYyVlX4UsuAvqakJ60AuZhp5BCo4Y6/1TvW AidE5EKEAfj/kD/cK6PmrTeu8K9dbd5zbKnfXvZppS632am4PoWJrsJulw6lYXEYhvGYey kghUYmBB+Je7aZ++fwwEVNmN2XXelIKaiuL8xHbutp+y5bKmDhNZ/XlKpBIKSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686241854; 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=lIs8K6P79OYPy6mRgqxsCpoey6dqYHHFyRy+ovzC8yM=; b=O3F+9v9rrVoYO2Y+MofMhRzyKpYNaQ7CibPsAftnrtbeRBTa/3aO6RTA4OSqu1Gkpc2oSc 7MyMtgvI5O/GCU6fIDrMzEziIG21FofK2wM7c7E8DgLhTEpqyVcPQY1633Gmp3GzR8N07j zUewVy8VoSzSAaciq8s27UIi6BZUZYUyksimA9RJ5n00Dx+Foqspz+y7bOKeR2eDW34Rjc 6lJg0+6HSKPEJD7l7v+5CIdHDiJayG3he8fw2MuMTxgPiV2vUoECUYdwG7k6akDG48MfUW Omwhf3w8uc5Cl8hSDXgbUkN4/pRMVV/LiGLOqrcalYIlJml4w9QF1XUZuneung== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686241854; a=rsa-sha256; cv=none; b=ZiySFMIAcQE7j62Y9VTVYx7/s0RAzkFkV8jqLMJHFScGLTreSHXTAwwM+g6+OzqmoiN2CI sd6Ec7ZDrXljpx0bo7Na+x7K0c+uAPx/STqLiGkVSjyAMhge56DGThuyCsdqAEqdBp6N6n mBArJYsoWuJjPJ5VehGDJA1Hn+Tb+2grPbf1c7rpgn+BZOlkMhsC3KTpK3sQorB4q/BcxB s8qOKD0e/9RmK2Ni2UWV62TDsKfT+VFLvGeNujHNOqY3BYn9nWzb2XsM76VD+u+ZpsCtTZ xtAYmlqYaGyP5Zwwz+rRarit6bJGmAHK2XNEAAXJufz3BMiv6jL9xFhRuAkpKQ== 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 4QcV7y1mv5z11TT; Thu, 8 Jun 2023 16:30:54 +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 358GUstH059986; Thu, 8 Jun 2023 16:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 358GUsce059985; Thu, 8 Jun 2023 16:30:54 GMT (envelope-from git) Date: Thu, 8 Jun 2023 16:30:54 GMT Message-Id: <202306081630.358GUsce059985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f40cd16bfda4 - main - kern: Move devctl_systems[] out of sys/sys/devctl.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f40cd16bfda4f4512033bb9e7212ee5d8b94b9a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f40cd16bfda4f4512033bb9e7212ee5d8b94b9a7 commit f40cd16bfda4f4512033bb9e7212ee5d8b94b9a7 Author: Ed Maste AuthorDate: 2023-06-08 13:58:26 +0000 Commit: Ed Maste CommitDate: 2023-06-08 16:28:04 +0000 kern: Move devctl_systems[] out of sys/sys/devctl.h The amd64-gcc12 build was failing with `error: 'devctl_systems' defined but not used`. Just move it to the C file where it's used. PR: 271903 Sponsored by: The FreeBSD Foundation --- sys/netlink/netlink_sysevent.c | 23 +++++++++++++++++++++++ sys/sys/devctl.h | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/netlink/netlink_sysevent.c b/sys/netlink/netlink_sysevent.c index 9da72a121ecd..01d0837b14d2 100644 --- a/sys/netlink/netlink_sysevent.c +++ b/sys/netlink/netlink_sysevent.c @@ -53,6 +53,29 @@ static struct sysevent_group { uint32_t id; } sysevent_groups[MAX_SYSEVENT_GROUPS] = {}; +static const char *devctl_systems[] = { + "ACPI", + "AEON", + "CAM", + "CARP", + "coretemp", + "DEVFS", + "device", + "ETHERNET", + "GEOM", + "HYPERV_NIC_VF", + "IFNET", + "INFINIBAND", + "KERNEL", + "nvme", + "PMU", + "RCTL", + "USB", + "VFS", + "VT", + "ZFS", +}; + static void sysevent_write(struct sysevent_group *se, const char *subsystem, const char *type, const char *data) diff --git a/sys/sys/devctl.h b/sys/sys/devctl.h index 5b613cf427df..da26eaabc26c 100644 --- a/sys/sys/devctl.h +++ b/sys/sys/devctl.h @@ -13,29 +13,6 @@ * hook to send the message. */ -static const char *devctl_systems[] = { - "ACPI", - "AEON", - "CAM", - "CARP", - "coretemp", - "DEVFS", - "device", - "ETHERNET", - "GEOM", - "HYPERV_NIC_VF", - "IFNET", - "INFINIBAND", - "KERNEL", - "nvme", - "PMU", - "RCTL", - "USB", - "VFS", - "VT", - "ZFS", -}; - bool devctl_process_running(void); void devctl_notify(const char *__system, const char *__subsystem, const char *__type, const char *__data);