[CRIU] [PATCH] vdso: x86 -- Simplify vdso_proxify

Cyrill Gorcunov gorcunov at openvz.org
Tue Aug 5 02:07:10 PDT 2014


No need for second if() statement, merge everything
in previous one.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 arch/x86/vdso-pie.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/vdso-pie.c b/arch/x86/vdso-pie.c
index 0a55d717357c..7fa458d98445 100644
--- a/arch/x86/vdso-pie.c
+++ b/arch/x86/vdso-pie.c
@@ -390,9 +390,7 @@ int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
 				pr_err("Failed to unmap %s\n", who);
 				return -1;
 			}
-		}
 
-		if (vma_vvar) {
 			if (vma_vdso->start < vma_vvar->start) {
 				ret  = vdso_remap(who, vdso_rt_parked_at, vma_vdso->start, vdso_vma_size(sym_rt));
 				vdso_rt_parked_at += vdso_vma_size(sym_rt);
-- 
1.9.3



More information about the CRIU mailing list