diff options
| author | Will Deacon <[email protected]> | 2022-12-06 10:36:52 +0000 |
|---|---|---|
| committer | Will Deacon <[email protected]> | 2022-12-06 10:36:52 +0000 |
| commit | c46ae1fc91087c105127218b44622d5d89cc4bb4 (patch) | |
| tree | cd72d98316445f142c6118c51eb995d1fb3a30e3 /include/linux | |
| parent | f0c4d9fc9cc9462659728d168387191387e903cc (diff) | |
| parent | 39522031798dbb53b169b95d4ab25b53301d4eaf (diff) | |
Merge branch 'for-next/acpi' into for-next/core
* for-next/acpi:
ACPI: APMT: Fix kerneldoc and indentation
ACPI: Enable FPDT on arm64
arm_pmu: acpi: handle allocation failure
arm_pmu: rework ACPI probing
arm_pmu: factor out PMU matching
arm_pmu: acpi: factor out PMU<->CPU association
ACPI/IORT: Update SMMUv3 DeviceID support
ACPI: ARM Performance Monitoring Unit Table (APMT) initial support
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi_apmt.h | 19 | ||||
| -rw-r--r-- | include/linux/perf/arm_pmu.h | 1 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/linux/acpi_apmt.h b/include/linux/acpi_apmt.h new file mode 100644 index 000000000000..40bd634d082f --- /dev/null +++ b/include/linux/acpi_apmt.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * ARM CoreSight PMU driver. + * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. + * + */ + +#ifndef __ACPI_APMT_H__ +#define __ACPI_APMT_H__ + +#include <linux/acpi.h> + +#ifdef CONFIG_ACPI_APMT +void acpi_apmt_init(void); +#else +static inline void acpi_apmt_init(void) { } +#endif /* CONFIG_ACPI_APMT */ + +#endif /* __ACPI_APMT_H__ */ diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index 0356cb6a215d..0c15c5b7f801 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -174,7 +174,6 @@ void kvm_host_pmu_init(struct arm_pmu *pmu); /* Internal functions only for core arm_pmu code */ struct arm_pmu *armpmu_alloc(void); -struct arm_pmu *armpmu_alloc_atomic(void); void armpmu_free(struct arm_pmu *pmu); int armpmu_register(struct arm_pmu *pmu); int armpmu_request_irq(int irq, int cpu); |