diff options
| author | Ard Biesheuvel <ard.biesheuvel@arm.com> | 2019-05-23 12:22:54 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2019-06-24 19:10:39 +0200 |
| commit | 4739d53fcd1df8a9f6f72bb02a3a1d852ad252b3 (patch) | |
| tree | e5f824c41f3e1de19dc0f4df5401bad920abf0ba /mm | |
| parent | arm64: module: create module allocations without exec permissions (diff) | |
| download | linux-4739d53fcd1df8a9f6f72bb02a3a1d852ad252b3.tar.xz linux-4739d53fcd1df8a9f6f72bb02a3a1d852ad252b3.zip | |
arm64/mm: wire up CONFIG_ARCH_HAS_SET_DIRECT_MAP
Wire up the special helper functions to manipulate aliases of vmalloc
regions in the linear map.
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmalloc.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 7350a124524b..6bd7b515995c 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2128,17 +2128,6 @@ static void vm_remove_mappings(struct vm_struct *area, int deallocate_pages) int flush_reset = area->flags & VM_FLUSH_RESET_PERMS; int i; - /* - * The below block can be removed when all architectures that have - * direct map permissions also have set_direct_map_() implementations. - * This is concerned with resetting the direct map any an vm alias with - * execute permissions, without leaving a RW+X window. - */ - if (flush_reset && !IS_ENABLED(CONFIG_ARCH_HAS_SET_DIRECT_MAP)) { - set_memory_nx(addr, area->nr_pages); - set_memory_rw(addr, area->nr_pages); - } - remove_vm_area(area->addr); /* If this is not VM_FLUSH_RESET_PERMS memory, no need for the below. */ |