From nobody Tue Jul 28 15:01:24 2026 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 4h8dvn5LyRz6msfK for ; Tue, 28 Jul 2026 15:01:25 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h8dvn0ZtRz3L4y for ; Tue, 28 Jul 2026 15:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785250885; 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=8l54HaKXn9ulbFPf/vQ9n/PVxJ+P8OhWpDRnqjQa0/E=; b=ljA+zSDOrx+WgOCO1IhTinvxI803Z7C8it2sFtO1yJGZEqsv0R3Qbdl8mE0bLcv075VC1v vq2mD8Ago0OOL73dSj5CmOzMhJcrpX7yNn6uHR+jI7OM19tCBe3ajc/Gg7fmxsVixNzVKb O7TWbo2gS+YywONaGALY463kG7ZfHTsosBFLzj1OKsBINVi1adx1TpyoV67bQiTKFnqZlG USpiVLWXswAft/0s8q4JXt+LaddIhLjHIp28kpOruBRwYFmNH6w4FykoxwsGocEkHKpsI0 GtS9zDXaMU+xASOuqO3rheYyymR2F/7dlS32Y58M15+FWh92DVZbw2WmdHN9PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785250885; a=rsa-sha256; cv=none; b=gC51DgLVS0wCtLlk7ue50y6gb02uQc6dwL5Cmf8Luv6xZp04cPoIdfgMdLW7yxoYf1o6ly 0GeLMJu9gpQV+1vWVZq+r85QTskEEdMvucdXtmY+/xA7PLr5B9U8sZH3yOmuZ5UE8T27fs aIiFgC31ubkO4370AWikUS+0o6N/LoUKZZRCPmWzQm/RdLbiHtbpKdJcmJzE2Ww/8NcpH/ RLnAp85VmSyk0/KBQLTfEqzNFFqPP+rTOfnD2H6Cl1Rs+5wx225hvvZwaSOHhA+hQqlHn6 8YzDvWKSTMFdZQ2LrkhML7LOKrohbGihujmzcZSRLH0PrlwBqas5IDrNWJbt3Q== 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=1785250885; 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=8l54HaKXn9ulbFPf/vQ9n/PVxJ+P8OhWpDRnqjQa0/E=; b=NvBBPeirjoJ91iSgILFWn875GNL14hmhisvvkpFIUedyBKeT2gXFOvvlEij+sgBi2H7YZw 9TO0VFeOOytwXf59/G6rPEVnxeJibye2Mw1KwGV1mFSC1SlyUngzex+y1tm3OnFQDp4QZU KkzGtqcaULktlb/08bC6RFsgSmnhyv2WIHP32vhcNeEShu3J3BrL1CVR6mSEJJdqnzGnGC 9ivirSFtQW5Ifxt4TSooniMc104Q22egum6fG8pKPjJ3uVnVT9tdYrXO3zzO2wcG85SxHm khdrEqdHilX9A0ZLnIkCfG7f4fMBkaTVf9ytT1MtOHYTm9gQOKB4GJ3MS1IhEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h8dvm6lWkzl0C for ; Tue, 28 Jul 2026 15:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e1d3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Jul 2026 15:01:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: cac0eab342c7 - main - sys/modules/hwpmc/Makefile: tidy up 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cac0eab342c702dc73e566e2038208c0bbc8fbd3 Auto-Submitted: auto-generated Date: Tue, 28 Jul 2026 15:01:24 +0000 Message-Id: <6a68c444.1e1d3.3fb9a98@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cac0eab342c702dc73e566e2038208c0bbc8fbd3 commit cac0eab342c702dc73e566e2038208c0bbc8fbd3 Author: Mitchell Horne AuthorDate: 2026-07-21 14:51:55 +0000 Commit: Mitchell Horne CommitDate: 2026-07-28 14:48:50 +0000 sys/modules/hwpmc/Makefile: tidy up This module has several source files, with many conditional on the platform architecture. Make it easier to read, and better for future diffs against these lists. - Convert to one SRC per line - Simplify arm/armv7 condition - Remove now-empty header comment - Minor formatting MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sys/modules/hwpmc/Makefile | 73 ++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index d13f52009600..52d64fc9ec42 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -1,41 +1,52 @@ -# -# - .PATH: ${SRCTOP}/sys/dev/hwpmc .PATH: ${SRCTOP}/sys/arm64/arm64 KMOD= hwpmc -SRCS= bus_if.h device_if.h hwpmc_mod.c hwpmc_logging.c hwpmc_soft.c -SRCS+= vnode_if.h +SRCS= hwpmc_mod.c \ + hwpmc_logging.c \ + hwpmc_soft.c +SRCS+= bus_if.h \ + device_if.h \ + vnode_if.h .if ${MACHINE_CPUARCH} == "aarch64" -SRCS+= hwpmc_arm64.c hwpmc_arm64_md.c -SRCS.DEV_ACPI= cmn600.c hwpmc_cmn600.c -SRCS.DEV_ACPI+= hwpmc_dmc620.c pmu_dmc620.c -.endif - -.if ${MACHINE_CPUARCH} == "amd64" -SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_ibs.c hwpmc_intel.c hwpmc_tsc.c -SRCS+= hwpmc_x86.c hwpmc_uncore.c -.endif - -.if ${MACHINE_CPUARCH} == "arm" -SRCS+= hwpmc_arm.c -.endif - -.if ${MACHINE_ARCH} == "armv7" -SRCS+= hwpmc_armv7.c -.endif - -.if ${MACHINE_CPUARCH} == "i386" -SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_ibs.c hwpmc_intel.c -SRCS+= hwpmc_tsc.c hwpmc_x86.c hwpmc_uncore.c -.endif - -.if ${MACHINE_CPUARCH} == "powerpc" -SRCS+= hwpmc_powerpc.c hwpmc_e500.c hwpmc_mpc7xxx.c hwpmc_ppc970.c \ - hwpmc_power8.c +SRCS+= hwpmc_arm64.c \ + hwpmc_arm64_md.c +SRCS.DEV_ACPI= cmn600.c \ + hwpmc_cmn600.c \ + hwpmc_dmc620.c \ + pmu_dmc620.c +SRCS+= opt_acpi.h + +.elif ${MACHINE_CPUARCH} == "amd64" +SRCS+= hwpmc_amd.c \ + hwpmc_core.c \ + hwpmc_ibs.c \ + hwpmc_intel.c \ + hwpmc_tsc.c \ + hwpmc_uncore.c \ + hwpmc_x86.c + +.elif ${MACHINE_CPUARCH} == "arm" +SRCS+= hwpmc_arm.c \ + hwpmc_armv7.c \ + +.elif ${MACHINE_CPUARCH} == "i386" +SRCS+= hwpmc_amd.c \ + hwpmc_core.c \ + hwpmc_ibs.c \ + hwpmc_intel.c \ + hwpmc_tsc.c \ + hwpmc_uncore.c \ + hwpmc_x86.c + +.elif ${MACHINE_CPUARCH} == "powerpc" +SRCS+= hwpmc_e500.c \ + hwpmc_mpc7xxx.c \ + hwpmc_ppc970.c \ + hwpmc_power8.c \ + hwpmc_powerpc.c .endif .include