diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 09:41:33 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-02-01 09:41:33 +0100 |
| commit | 10a558374f3751cf4eb55143008975641dfc2cf4 (patch) | |
| tree | aab0def9d2289f6520ffb62ec4c1d738135447c4 /drivers/perf/arm_pmu_acpi.c | |
| parent | Input: goodix - use generic touchscreen_properties (diff) | |
| parent | Linux 4.15 (diff) | |
| download | linux-10a558374f3751cf4eb55143008975641dfc2cf4.tar.xz linux-10a558374f3751cf4eb55143008975641dfc2cf4.zip | |
Merge tag 'v4.15' into next
Sync with mainline to get in trackpoint updates and other changes.
Diffstat (limited to 'drivers/perf/arm_pmu_acpi.c')
| -rw-r--r-- | drivers/perf/arm_pmu_acpi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index 3303dd8d8eb5..705f1a390e31 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -193,9 +193,6 @@ int arm_pmu_acpi_probe(armpmu_init_fn init_fn) int pmu_idx = 0; int cpu, ret; - if (acpi_disabled) - return 0; - /* * Initialise and register the set of PMUs which we know about right * now. Ideally we'd do this in arm_pmu_acpi_cpu_starting() so that we |