Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18f6c1a5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: cpufeature: Pass capability structure to ->enable callback"

parents 8543ad06 715fcb10

arch/arm64/kernel/cpufeature.c

+3 −2
Original line number Diff line number Diff line
@@ -871,7 +871,8 @@ void __init enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps) 
			 * uses an IPI, giving us a PSTATE that disappears when

			 * we return.

			 */

			stop_machine(caps[i].enable, NULL, cpu_online_mask);

			stop_machine(caps[i].enable, (void *)&caps[i],

							cpu_online_mask);

}



#ifdef CONFIG_HOTPLUG_CPU
@@ -986,7 +987,7 @@ void verify_local_cpu_capabilities(void) 
		if (!feature_matches(__raw_read_system_reg(caps[i].sys_reg), &caps[i]))

			fail_incapable_cpu("arm64_features", &caps[i]);

		if (caps[i].enable)

			caps[i].enable(NULL);

			caps[i].enable((void *)&caps[i]);

	}



	for (i = 0, caps = arm64_hwcaps; caps[i].matches; i++) {