Commit 6906e1a8 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

vdso: Drop unneeded @vdso_rt_vma_size variable

Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent b00bdb2d
...@@ -2358,7 +2358,6 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core) ...@@ -2358,7 +2358,6 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
unsigned long tcp_socks; unsigned long tcp_socks;
#ifdef CONFIG_VDSO #ifdef CONFIG_VDSO
unsigned long vdso_rt_vma_size = 0;
unsigned long vdso_rt_size = 0; unsigned long vdso_rt_size = 0;
unsigned long vdso_rt_delta = 0; unsigned long vdso_rt_delta = 0;
#endif #endif
...@@ -2428,10 +2427,10 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core) ...@@ -2428,10 +2427,10 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
/* /*
* Figure out how much memory runtime vdso and vvar will need. * Figure out how much memory runtime vdso and vvar will need.
*/ */
vdso_rt_vma_size = vdso_vma_size(&vdso_sym_rt); vdso_rt_size = vdso_vma_size(&vdso_sym_rt);
if (vdso_rt_vma_size) { if (vdso_rt_size) {
vdso_rt_delta = ALIGN(restore_bootstrap_len, PAGE_SIZE) - restore_bootstrap_len; vdso_rt_delta = ALIGN(restore_bootstrap_len, PAGE_SIZE) - restore_bootstrap_len;
vdso_rt_size = vdso_rt_vma_size + vdso_rt_delta; vdso_rt_size += vdso_rt_delta;
if (vvar_vma_size(&vdso_sym_rt)) if (vvar_vma_size(&vdso_sym_rt))
vdso_rt_size += ALIGN(vvar_vma_size(&vdso_sym_rt), PAGE_SIZE); vdso_rt_size += ALIGN(vvar_vma_size(&vdso_sym_rt), PAGE_SIZE);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment