Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / drivers / perf / arm_pmuv3.c

diff --git a/drivers/perf/arm_pmuv3.c b/drivers/perf/arm_pmuv3.c
index 93b7edb5f1e7c15fadc945510b3674dfc43374b0..08b3a1bf0ef62a8ce126b9506507a67a25a81b5f 100644 (file)
--- a/drivers/perf/arm_pmuv3.c
+++ b/drivers/perf/arm_pmuv3.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/sched_clock.h>
 #include <linux/smp.h>
+#include <linux/nmi.h>
 
 #include <asm/arm_pmuv3.h>
 
@@ -1363,10 +1364,17 @@ static struct platform_driver armv8_pmu_driver = {
 
 static int __init armv8_pmu_driver_init(void)
 {
+       int ret;
+
        if (acpi_disabled)
-               return platform_driver_register(&armv8_pmu_driver);
+               ret = platform_driver_register(&armv8_pmu_driver);
        else
-               return arm_pmu_acpi_probe(armv8_pmuv3_pmu_init);
+               ret = arm_pmu_acpi_probe(armv8_pmuv3_pmu_init);
+
+       if (!ret)
+               lockup_detector_retry_init();
+
+       return ret;
 }
 device_initcall(armv8_pmu_driver_init)