tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

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

Linus Torvalds 6284c99c 3c9fdefe

+5 -3
+2 -2
arch/arm64/kernel/cpufeature.c
··· 1351 1351 1352 1352 static void update_cpu_capabilities(u16 scope_mask) 1353 1353 { 1354 - __update_cpu_capabilities(arm64_features, scope_mask, "detected:"); 1355 1354 __update_cpu_capabilities(arm64_errata, scope_mask, 1356 1355 "enabling workaround for"); 1356 + __update_cpu_capabilities(arm64_features, scope_mask, "detected:"); 1357 1357 } 1358 1358 1359 1359 static int __enable_cpu_capability(void *arg) ··· 1408 1408 1409 1409 static void __init enable_cpu_capabilities(u16 scope_mask) 1410 1410 { 1411 - __enable_cpu_capabilities(arm64_features, scope_mask); 1412 1411 __enable_cpu_capabilities(arm64_errata, scope_mask); 1412 + __enable_cpu_capabilities(arm64_features, scope_mask); 1413 1413 } 1414 1414 1415 1415 /*
+3 -1
arch/arm64/mm/init.c
··· 611 611 BUILD_BUG_ON(TASK_SIZE_32 > TASK_SIZE_64); 612 612 #endif 613 613 614 + #ifdef CONFIG_SPARSEMEM_VMEMMAP 614 615 /* 615 616 * Make sure we chose the upper bound of sizeof(struct page) 616 - * correctly. 617 + * correctly when sizing the VMEMMAP array. 617 618 */ 618 619 BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT)); 620 + #endif 619 621 620 622 if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) { 621 623 extern int sysctl_overcommit_memory;