Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Leftover put_cpu() in the perf/smmuv3 error path.
- Add Hisilicon TSV110 to spectre-v2 safe list
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: cpu_errata: Add Hisilicon TSV110 to spectre-v2 safe list
perf/smmuv3: Remove the leftover put_cpu() in error path
+2
-3
+1
arch/arm64/kernel/cpu_errata.c
+1
arch/arm64/kernel/cpu_errata.c
+1
-3
drivers/perf/arm_smmuv3_pmu.c
+1
-3
drivers/perf/arm_smmuv3_pmu.c
···
814
814
if (err) {
815
815
dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",
816
816
err, &res_0->start);
817
-
goto out_cpuhp_err;
817
+
return err;
818
818
}
819
819
820
820
err = perf_pmu_register(&smmu_pmu->pmu, name, -1);
···
833
833
834
834
out_unregister:
835
835
cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node);
836
-
out_cpuhp_err:
837
-
put_cpu();
838
836
return err;
839
837
}
840
838