[CRIU] [PATCH] s390/vdso: Add arch-stubs for vdso map API

[Andrei Vagin]

Applied, thanks
On Fri, Jul 21, 2017 at 06:44:37PM +0300, Dmitry Safonov wrote:
> That's a merge conflict between vdso patches set and s390 set.
> 
> Cc: Michael Holzheu <holzheu at linux.vnet.ibm.com>
> Cc: Alice Frosi <alice at linux.vnet.ibm.com>
> Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
> ---
>  criu/arch/s390/include/asm/restorer.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/criu/arch/s390/include/asm/restorer.h b/criu/arch/s390/include/asm/restorer.h
> index 0fd23cff150e..63e09986339b 100644
> --- a/criu/arch/s390/include/asm/restorer.h
> +++ b/criu/arch/s390/include/asm/restorer.h
> @@ -40,6 +40,8 @@
>  	: "0", "1", "2", "3", "4", "5", "6", "cc", "memory")
>  
>  #define kdat_compatible_cr()			0
> +#define kdat_can_map_vdso()			0
> +#define arch_map_vdso(map, compat)		-1
>  
>  int restore_gpregs(struct rt_sigframe *f, UserS390RegsEntry *r);
>  int restore_nonsigframe_gpregs(UserS390RegsEntry *r);
> -- 
> 2.13.3
>