Signed-off-by: Tomasz Nowicki tomasz.nowicki@linaro.org --- arch/arm64/kernel/perf_event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 9ba33c4..c70a187 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -28,6 +28,9 @@ #include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/uaccess.h> +#ifdef CONFIG_ACPI +#include <linux/acpi.h> +#endif
#include <asm/cputype.h> #include <asm/irq.h> @@ -1221,6 +1224,13 @@ static struct of_device_id armpmu_of_device_ids[] = { {}, };
+#ifdef CONFIG_ACPI +static const struct acpi_device_id armpmu_acpi_match[] = { + { "LINA0007", }, + {}, +}; +#endif + static int armpmu_device_probe(struct platform_device *pdev) { if (!cpu_pmu) @@ -1234,6 +1244,9 @@ static struct platform_driver armpmu_driver = { .driver = { .name = "arm-pmu", .of_match_table = armpmu_of_device_ids, +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(armpmu_acpi_match), +#endif }, .probe = armpmu_device_probe, };