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

Pull arm64 fixes from Will Deacon: "Inevitably, after saying that I hoped we would be done on the fixes front, a couple of issues have cropped up over the last week. Next time I'll stay schtum. We've fixed an over-eager BUILD_BUG_ON() which Arnd ran into with arndconfig, as well as ensuring that KPTI really is disabled on Thunder-X1, where the cure is worse than the disease (this regressed when we reworked the heterogeneous CPU feature checking). Summary: - Fix disabling of kpti on Thunder-X machines - Fix premature BUILD_BUG_ON() found with randconfig" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: fix vmemmap BUILD_BUG_ON() triggering on !vmemmap setups arm64: Check for errata before evaluating cpu features

arch/arm64/kernel/cpufeature.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1351,9 +1351,9 @@ static void __update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

		static void update_cpu_capabilities(u16 scope_mask)
		{
		__update_cpu_capabilities(arm64_features, scope_mask, "detected:");
		__update_cpu_capabilities(arm64_errata, scope_mask,
		"enabling workaround for");
		__update_cpu_capabilities(arm64_features, scope_mask, "detected:");
		}

		static int __enable_cpu_capability(void *arg)
		@@ -1408,8 +1408,8 @@ __enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

		static void __init enable_cpu_capabilities(u16 scope_mask)
		{
		__enable_cpu_capabilities(arm64_features, scope_mask);
		__enable_cpu_capabilities(arm64_errata, scope_mask);
		__enable_cpu_capabilities(arm64_features, scope_mask);
		}

		/*

arch/arm64/mm/init.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -611,11 +611,13 @@ void __init mem_init(void)
		BUILD_BUG_ON(TASK_SIZE_32 > TASK_SIZE_64);
		#endif

		#ifdef CONFIG_SPARSEMEM_VMEMMAP
		/*
		* Make sure we chose the upper bound of sizeof(struct page)
		* correctly.
		* correctly when sizing the VMEMMAP array.
		*/
		BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT));
		#endif

		if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) {
		extern int sysctl_overcommit_memory;

Admin message