UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/vdso: remove superfluous variables 

A few local variables exist only so the contents of a global variable
can be copied to them, and use that value only for reading.
Just remove them and rename some global variables. Also change
vdso64_[start|end] to be character arrays to be consistent with other
architectures, and get rid of the global variable vdso64_kbase.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Heiko Carstens 2021-01-24 20:22:29 +01:00 committed by Vasily Gorbik
parent 5ffd9af0fb
commit 6755270b5e
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/s390/kernel/vdso.c
View File

@ -31,10 +31,9 @@
#include <asm/facility.h> #include <asm/facility.h>
#include <asm/timex.h> #include <asm/timex.h>
extern char vdso64_start, vdso64_end; extern char vdso64_start[], vdso64_end[];
static void *vdso64_kbase = &vdso64_start; static unsigned int vdso_pages;
static unsigned int vdso64_pages; static struct page **vdso_pagelist;
static struct page **vdso64_pagelist;
/* /*
* Should the kernel map a VDSO page into processes and pass its * Should the kernel map a VDSO page into processes and pass its
@ -45,12 +44,6 @@ unsigned int __read_mostly vdso_enabled = 1;
static vm_fault_t vdso_fault(const struct vm_special_mapping *sm, static vm_fault_t vdso_fault(const struct vm_special_mapping *sm,
struct vm_area_struct *vma, struct vm_fault *vmf) struct vm_area_struct *vma, struct vm_fault *vmf)
{ {
struct page **vdso_pagelist;
unsigned long vdso_pages;
vdso_pagelist = vdso64_pagelist;
vdso_pages = vdso64_pages;
if (vmf->pgoff >= vdso_pages) if (vmf->pgoff >= vdso_pages)
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
@ -107,7 +100,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
{ {
struct mm_struct *mm = current->mm; struct mm_struct *mm = current->mm;
struct vm_area_struct *vma; struct vm_area_struct *vma;
unsigned long vdso_pages;
unsigned long vdso_base; unsigned long vdso_base;
int rc; int rc;
@ -117,7 +109,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
if (is_compat_task()) if (is_compat_task())
return 0; return 0;
vdso_pages = vdso64_pages;
/* /*
* pick a base address for the vDSO in process space. We try to put * pick a base address for the vDSO in process space. We try to put
* it at vdso_base which is the "natural" base for it, but we might * it at vdso_base which is the "natural" base for it, but we might
@ -162,23 +153,23 @@ static int __init vdso_init(void)
{ {
int i; int i;
/* Calculate the size of the 64 bit vDSO */ /* Calculate the size of the vDSO */
vdso64_pages = ((&vdso64_end - &vdso64_start) >> PAGE_SHIFT) + 1; vdso_pages = ((vdso64_end - vdso64_start) >> PAGE_SHIFT) + 1;
/* Make sure pages are in the correct state */ /* Make sure pages are in the correct state */
vdso64_pagelist = kcalloc(vdso64_pages + 1, sizeof(struct page *), vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
GFP_KERNEL); GFP_KERNEL);
if (!vdso64_pagelist) { if (!vdso_pagelist) {
vdso_enabled = 0; vdso_enabled = 0;
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < vdso64_pages - 1; i++) { for (i = 0; i < vdso_pages - 1; i++) {
struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE); struct page *pg = virt_to_page(vdso64_start + i * PAGE_SIZE);
get_page(pg); get_page(pg);
vdso64_pagelist[i] = pg; vdso_pagelist[i] = pg;
} }
vdso64_pagelist[vdso64_pages - 1] = virt_to_page(vdso_data); vdso_pagelist[vdso_pages - 1] = virt_to_page(vdso_data);
vdso64_pagelist[vdso64_pages] = NULL; vdso_pagelist[vdso_pages] = NULL;
get_page(virt_to_page(vdso_data)); get_page(virt_to_page(vdso_data));