Messages in this thread Patch in this message | | | From | Dmitry Safonov <> | Subject | [PATCH v3 11/23] s390/vdso: Remove vdso_base pointer from mm->context | Date | Fri, 11 Jun 2021 19:02:30 +0100 |
| |
Not used any more: now sysinfo_ehdr is passed back from arch_setup_additional_pages() to set AT_SYSINFO_EHDR tag. .vdso_mremap() was only to track proper position of context.vdso throughout any mremap() syscalls, remove it too.
Cc: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: linux-s390@vger.kernel.org Signed-off-by: Dmitry Safonov <dima@arista.com> --- arch/s390/include/asm/mmu.h | 1 - arch/s390/kernel/vdso.c | 9 --------- 2 files changed, 10 deletions(-)
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h index e12ff0f29d1a..095d0596f700 100644 --- a/arch/s390/include/asm/mmu.h +++ b/arch/s390/include/asm/mmu.h @@ -15,7 +15,6 @@ typedef struct { unsigned long gmap_asce; unsigned long asce; unsigned long asce_limit; - unsigned long vdso_base; /* The mmu context belongs to a secure guest. */ atomic_t is_protected; /* diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index 8a72fdedbae9..b8fb43d3b657 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c @@ -143,13 +143,6 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm, return vmf_insert_pfn(vma, vmf->address, pfn); } -static int vdso_mremap(const struct vm_special_mapping *sm, - struct vm_area_struct *vma) -{ - current->mm->context.vdso_base = vma->vm_start; - return 0; -} - static struct vm_special_mapping vvar_mapping = { .name = "[vvar]", .fault = vvar_fault, @@ -157,7 +150,6 @@ static struct vm_special_mapping vvar_mapping = { static struct vm_special_mapping vdso_mapping = { .name = "[vdso]", - .mremap = vdso_mremap, }; int vdso_getcpu_init(void) @@ -203,7 +195,6 @@ int arch_setup_additional_pages(unsigned long *sysinfo_ehdr) do_munmap(mm, vvar_start, PAGE_SIZE, NULL); rc = PTR_ERR(vma); } else { - current->mm->context.vdso_base = vdso_text_start; *sysinfo_ehdr = vdso_text_start; rc = 0; } -- 2.31.1
| |