[1/3] compel/aarch64: glibc renamed ucontext to ucontext_t

Submitted by Adrian Reber on July 20, 2017, 4:08 p.m.

Details

Message ID 20170720160836.31174-1-adrian@lisas.de
State Accepted
Series "Series without cover letter"
Headers show

Commit Message

Adrian Reber July 20, 2017, 4:08 p.m.
From: Adrian Reber <areber@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@redhat.com>
---
 compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
index c890d103..22246b8f 100644
--- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
@@ -27,7 +27,7 @@  struct aux_context {
 
 struct rt_sigframe {
 	siginfo_t			info;
-	struct ucontext			uc;
+	ucontext_t			uc;
 	uint64_t			fp;
 	uint64_t			lr;
 };

Comments

Dmitry Safonov July 20, 2017, 4:24 p.m.
On 07/20/2017 07:08 PM, Adrian Reber wrote:
> From: Adrian Reber <areber@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@redhat.com>

For all 3
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>

> ---
>   compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
> index c890d103..22246b8f 100644
> --- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
> +++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
> @@ -27,7 +27,7 @@ struct aux_context {
>   
>   struct rt_sigframe {
>   	siginfo_t			info;
> -	struct ucontext			uc;
> +	ucontext_t			uc;
>   	uint64_t			fp;
>   	uint64_t			lr;
>   };
>
Andrey Vagin July 21, 2017, 3:11 p.m.
Applied, thanks
On Thu, Jul 20, 2017 at 12:08:34PM -0400, Adrian Reber wrote:
> From: Adrian Reber <areber@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@redhat.com>
> ---
>  compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
> index c890d103..22246b8f 100644
> --- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
> +++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
> @@ -27,7 +27,7 @@ struct aux_context {
>  
>  struct rt_sigframe {
>  	siginfo_t			info;
> -	struct ucontext			uc;
> +	ucontext_t			uc;
>  	uint64_t			fp;
>  	uint64_t			lr;
>  };
> -- 
> 2.13.2
> 
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu