Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (3939f2c8) · Commits · 戴 / test

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

arch/arm64/kernel/cpu_errata.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -547,6 +547,7 @@ static const struct midr_range spectre_v2_safe_list[] = {
		MIDR_ALL_VERSIONS(MIDR_CORTEX_A53),
		MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
		MIDR_ALL_VERSIONS(MIDR_BRAHMA_B53),
		MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),
		{ /* sentinel */ }
		};

drivers/perf/arm_smmuv3_pmu.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -814,7 +814,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
		if (err) {
		dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",
		err, &res_0->start);
		goto out_cpuhp_err;
		return err;
		}

		err = perf_pmu_register(&smmu_pmu->pmu, name, -1);
		@@ -833,8 +833,6 @@ static int smmu_pmu_probe(struct platform_device *pdev)

		out_unregister:
		cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node);
		out_cpuhp_err:
		put_cpu();
		return err;
		}

Admin message