[CRIU] [PATCH] vdso: aarch64 -- Merge fixes from x86

[Christopher Covington]

This brings the changes made in the following commits to the
aarch64 copy of the code.

commit 7794f67f2055420c6b6c2967edfbe0c39a7cd744
Author: Cyrill Gorcunov <gorcunov at openvz.org>
Date:   Tue Aug 5 13:59:18 2014 +0400

    vdso: x86 -- Fix missing ability to remap vDSO if only one zone present

commit 066add0de44f462e7482571763f303ded0b4762f
Author: Cyrill Gorcunov <gorcunov at openvz.org>
Date:   Tue Aug 5 13:07:00 2014 +0400

    vdso: x86 -- Simplify vdso_proxify

Signed-off-by: Christopher Covington <cov at codeaurora.org>
---
 arch/aarch64/vdso-pie.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/aarch64/vdso-pie.c b/arch/aarch64/vdso-pie.c
index c1eece3..c655837 100644
--- a/arch/aarch64/vdso-pie.c
+++ b/arch/aarch64/vdso-pie.c
@@ -345,7 +345,8 @@ int vdso_proxify(char *who, struct vdso_symtable *sym_rt,
 
 					remap_rt = (delta_rt ^ delta_this) < 0 ? false : true;
 				}
-			}
+			} else
+				remap_rt = true;
 		}
 	}
 
@@ -378,9 +379,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);
-- 
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by the Linux Foundation.