From dcdb7eadfde5639d57508570d72b873da60e5bb1 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Mon, 21 Nov 2022 12:21:05 +0000 Subject: [PATCH] Revert "FROMGIT: mm/vmalloc: Add override for lazy vunmap" Revert submission 2302443 Reason for revert: Series is not queued in a maintainer tree and has not been posted to a public mailing list. Reverted Changes: Iffd38bf97:FROMGIT: arm64: Work around Cortex-A510 erratum 24... I694523564:FROMGIT: mm/vmalloc: Add override for lazy vunmap Change-Id: I345e32bac76292413908b4a81295a228003fa4c0 Signed-off-by: Will Deacon --- include/linux/vmalloc.h | 4 ---- mm/vmalloc.c | 3 --- 2 files changed, 7 deletions(-) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 12c55bbec8c0..0549ca17ba6f 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -245,8 +245,4 @@ pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms) int register_vmap_purge_notifier(struct notifier_block *nb); int unregister_vmap_purge_notifier(struct notifier_block *nb); -#ifndef arch_disable_lazy_vunmap -#define arch_disable_lazy_vunmap false -#endif - #endif /* _LINUX_VMALLOC_H */ diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 50d49ca35885..817a472ee30f 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1297,9 +1297,6 @@ static unsigned long lazy_max_pages(void) { unsigned int log; - if (arch_disable_lazy_vunmap) - return 0; - log = fls(num_online_cpus()); return log * (32UL * 1024 * 1024 / PAGE_SIZE);