Page MenuHomeFreeBSD
Files F102032773

D38736.diff
No OneTemporary
Actions

D38736.diff
View Options

diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c
--- a/sys/arm64/arm64/cmn600.c
+++ b/sys/arm64/arm64/cmn600.c
@@ -1,7 +1,7 @@
/*-
* SPDX-License-Identifier: BSD-2-Clause
*
- * Copyright (c) 2021-2022 Arm Ltd
+ * Copyright (c) 2021 ARM Ltd
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,10 +34,6 @@
#include "opt_acpi.h"
-/*
- * This depends on ACPI, but is built unconditionally in the hwpmc module.
- */
-#ifdef DEV_ACPI
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kernel.h>
@@ -835,4 +831,3 @@
DRIVER_MODULE(cmn600, acpi, cmn600_acpi_driver, 0, 0);
MODULE_VERSION(cmn600, 1);
-#endif /* DEV_ACPI */
diff --git a/sys/dev/hwpmc/hwpmc_cmn600.c b/sys/dev/hwpmc/hwpmc_cmn600.c
--- a/sys/dev/hwpmc/hwpmc_cmn600.c
+++ b/sys/dev/hwpmc/hwpmc_cmn600.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2003-2008 Joseph Koshy
* Copyright (c) 2007 The FreeBSD Foundation
- * Copyright (c) 2021-2022 ARM Ltd
+ * Copyright (c) 2021 ARM Ltd
*
* Portions of this software were developed by A. Joseph Koshy under
* sponsorship from the FreeBSD Foundation and Google, Inc.
@@ -35,12 +35,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_acpi.h"
-
-/*
- * This depends on ACPI, but is built unconditionally in the hwpmc module.
- */
-#ifdef DEV_ACPI
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/malloc.h>
@@ -830,4 +824,3 @@
}
MODULE_DEPEND(pmc, cmn600, 1, 1, 1);
-#endif /* DEV_ACPI */
diff --git a/sys/dev/hwpmc/pmu_dmc620.c b/sys/dev/hwpmc/pmu_dmc620.c
--- a/sys/dev/hwpmc/pmu_dmc620.c
+++ b/sys/dev/hwpmc/pmu_dmc620.c
@@ -2,7 +2,6 @@
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (c) 2021 Ampere Computing LLC
- * Copyright (c) 2022 Arm Ltd
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -34,10 +33,6 @@
#include "opt_hwpmc_hooks.h"
#include "opt_acpi.h"
-/*
- * This depends on ACPI, but is built unconditionally in the hwpmc module.
- */
-#ifdef DEV_ACPI
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/module.h>
@@ -280,4 +275,3 @@
/* Reverse dependency. hwpmc needs DMC-620 on ARM64. */
MODULE_DEPEND(pmc, pmu_dmc620, 1, 1, 1);
MODULE_VERSION(pmu_dmc620, 1);
-#endif /* DEV_ACPI */
diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile
--- a/sys/modules/hwpmc/Makefile
+++ b/sys/modules/hwpmc/Makefile
@@ -12,9 +12,11 @@
.if ${MACHINE_CPUARCH} == "aarch64"
SRCS+= hwpmc_arm64.c hwpmc_arm64_md.c
+.if !empty(OPT_ACPI)
SRCS+= cmn600.c hwpmc_cmn600.c
SRCS+= hwpmc_dmc620.c pmu_dmc620.c
.endif
+.endif
.if ${MACHINE_CPUARCH} == "amd64"
SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_tsc.c

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 6:30 PM (21 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14518449
Default Alt Text
D38736.diff (2 KB)

Event Timeline