From nobody Fri Oct 30 14:05:45 2026 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 4jGND94BFXz6wwLk for ; Fri, 30 Oct 2026 14:05:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGND93NRdz4pY2 for ; Fri, 30 Oct 2026 14:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369145; 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=CevQqN9PzX6JMoCgmq9RHS+8okjEBb6VvyikvFGlQy4=; b=uRH0/0DRUpWHI8erHFk4/mCWE2mL+t0iMH5hCjxxpENwRx+40E8y2RVhRCxLINbzDgkLIy YqGecVfkpR+8TNPsix5365xHBNScgA9Z/iA9n0sPXf+w23fAyrb1T+JoTO/cVUmMalBmOu l65bfYOpZuoG0JMZ+7gLBru7RW6fVT2hG1fDfbXro8sUp8arTq9DXrsF5XgFHh0gPGGKd6 ObgymPcpHhBvTel7WRYyTzXFB1fQGgvBf7hVnHL5OwLNWXUdrfEHPyZ4YgQ+03YE9fs4MU KBAUGqno626ttZn/LxfQxCHeL20DXBSx8aHrNUTjLgpzhAwAgxi/MthraQtKKA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793369145; b=IPM59hpXNCEu5FT4qBHalQhOZn/LvKw2e0F4s/gS5ws7YedIWiaAK209o5sH2aEum/Yf81 srKXngBISCguJ7Nd9dywt5wMWTRP1ewypd3siumMWFEwpNhYvsuc+S5IAD3IDE6mt6TX9z D/DkxIJHn60+LnqbGfvFvwYRB3DjvFN+huc3WZlojUyi9DvLxNXV/0mxl7z7/N0FohDyW9 twU0HcqQQCDmj809FpiU72X761KhhTNLE62cIEnnddDI7A+XQbHY5fAjckuqc7MAvbiRS0 2ODFwzCRvUajewfXqG4YF9WMe6sTJQVCUPZe1JWbsFvVGvMA4OBBPJ1x7tJN+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369145; 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=CevQqN9PzX6JMoCgmq9RHS+8okjEBb6VvyikvFGlQy4=; b=AJwX2hCILs9pEfy5Bdd/cUt5GeWhontlJVf21zs9ZLW5QDuS2Od380RbZBXhhsM32rbZKi +hoOYz4eW49ljEPsrKWHQcIHeiUwUNo1RVgO5FRA4/Q7HEv8zeG8vV50k/IFGnMIDYVQKk 2TY9MOt7aW0ts0C0vCs3vb+cxmpU3XIRKYWpFB+/3e6Bezjt+NjJLLOzMoXfTypYDq7ULb ChXd9tx6i8O6XHQGn4QiOo8aGkoQanI8shnjvwXWreQt1Y6D17M/mQL/nKdAnp2qq5VNWi foRUknmt7dI4m4+nLo45Jf1FThEAeLObrPKJF6b+YRSTYokucJ5PDnwWgd6xOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGND92nBbzV9W for ; Fri, 30 Oct 2026 14:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f8f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 14:05:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b16646109aa8 - stable/15 - sys/modules/hwpmc/Makefile: tidy up List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b16646109aa8f17f8a03175520e3815389eab5b9 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 14:05:45 +0000 Message-Id: <6ae4a439.1f8f3.1d9c862e@gitrepo.freebsd.org> The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b16646109aa8f17f8a03175520e3815389eab5b9 commit b16646109aa8f17f8a03175520e3815389eab5b9 Author: Mitchell Horne AuthorDate: 2026-07-21 14:51:55 +0000 Commit: Mitchell Horne CommitDate: 2026-10-30 13:59:05 +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 (cherry picked from commit cac0eab342c702dc73e566e2038208c0bbc8fbd3) --- sys/modules/hwpmc/Makefile | 71 ++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index 812e3fbf182c..fb6a04056a29 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -1,41 +1,50 @@ -# -# - .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_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_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_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_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