[CRIU] [PATCH 3/3] compel/s390: glibc renamed ucontext to ucontext_t

[Michael Holzheu]

Am Thu, 20 Jul 2017 12:08:36 -0400
schrieb Adrian Reber <adrian at lisas.de>:

> From: Adrian Reber <areber at redhat.com>
> 
> The upcoming glibc release renamed 'struct ucontext' to
> 'struct ucontext_t':
> 
> https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9;hp=c86ed71d633c22d6f638576f7660c52a5f783d66
> 
> Instead of using 'struct ucontext' this patch changes it
> to the typedef ucontext_t which already exists in older and
> new versions of glibc.
> 
> Signed-off-by: Adrian Reber <areber at redhat.com>
> ---
>  compel/arch/s390/src/lib/include/uapi/asm/sigframe.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h b/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
> index d0432024..47c39f64 100644
> --- a/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
> +++ b/compel/arch/s390/src/lib/include/uapi/asm/sigframe.h
> @@ -37,7 +37,7 @@ typedef struct {
>   */
>  struct ucontext_extended {
>  	unsigned long     uc_flags;
> -	struct ucontext  *uc_link;
> +	ucontext_t       *uc_link;
>  	stack_t           uc_stack;
>  	_sigregs          uc_mcontext;
>  	sigset_t          uc_sigmask;

Ich checked Ubuntu 16.04 and Debian Jessie.

For both we have:

/usr/include/s390x-linux-gnu/sys/ucontext.h:
typedef struct ucontext ucontext_t;

Reviewed-by: Michael Holzheu <holzheu at linux.vnet.ibm.com>