The patch titled Subject: mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix has been added to the -mm tree. Its filename is mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix build fix - go back to using an ifdef Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Joerg Roedel <jroedel@xxxxxxx> Cc: Qian Cai <cai@xxxxxx> Cc: Shile Zhang <shile.zhang@xxxxxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix +++ a/mm/vmalloc.c @@ -1255,17 +1255,17 @@ static bool __purge_vmap_area_lazy(unsig if (unlikely(valist == NULL)) return false; - if (IS_ENABLED(CONFIG_X86_PAE)) { - /* - * First make sure the mappings are removed from all page-tables - * before they are freed. - * - * This is only needed on x86-32 with !SHARED_KERNEL_PMD, which - * is the case on a PAE kernel with PTI enabled. - */ - if (!SHARED_KERNEL_PMD && boot_cpu_has(X86_FEATURE_PTI)) - vmalloc_sync_all(); - } +#ifdef CONFIG_X86_PAE + /* + * First make sure the mappings are removed from all pagetables before + * they are freed. + * + * This is only needed on x86-32 with !SHARED_KERNEL_PMD, which is the + * case on a PAE kernel with PTI enabled. + */ + if (!SHARED_KERNEL_PMD && boot_cpu_has(X86_FEATURE_PTI)) + vmalloc_sync_all(); +#endif /* * TODO: to calculate a flush range without looping. _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix.patch mm-vmalloc-fix-regression-caused-by-needless-vmalloc_sync_all-fix-fix.patch mm.patch mm-swap-disallow-swapon-on-zoned-block-devices-fix.patch rss_stat-add-support-to-detect-rss-updates-of-external-mm-fix.patch mm-pgmap-use-correct-alignment-when-looking-at-first-pfn-from-a-region-checkpatch-fixes.patch memfd-fix-cow-issue-on-map_private-and-f_seal_future_write-mappings-fix.patch mm-vmscan-simplify-lruvec_lru_size-fix-fix.patch mm-oom-avoid-printk-iteration-under-rcu-fix.patch hugetlb-remove-duplicated-code-checkpatch-fixes.patch hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch mm-madvise-replace-with-page_size-in-madvise_inject_error-fix.patch mm-annotate-refault-stalls-from-swap_readpage-fix.patch lib-optimize-cpumask_local_spread-v3-fix.patch usb-kcov-collect-coverage-from-hub_event-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch diff-sucks.patch drivers-block-null_blk_mainc-fix-layout.patch drivers-block-null_blk_mainc-fix-uninitialized-var-warnings.patch bitops-introduce-the-for_each_set_clump8-macro-fix-fix.patch drivers-tty-serial-sh-scic-suppress-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch