From fb1e63b8b2568a7030c7a35a33985ec0ae09997e Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 25 Jun 2026 21:36:25 +0000 Subject: [PATCH] compel/arm64: rename gcs_context to avoid conflicts with system headers In file included from compel/plugins/std/infect.c:14: compel/include/uapi/compel/asm/sigframe.h:17:8: error: redefinition of 'gcs_context' 17 | struct gcs_context { | ^ /usr/include/aarch64-linux-gnu/asm/sigcontext.h:188:8: note: previous definition is here 188 | struct gcs_context { | ^ Signed-off-by: Andrei Vagin --- compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h | 4 ++-- compel/arch/aarch64/src/lib/infect.c | 2 +- criu/arch/aarch64/crtools.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 7efee528f..d3a46c2b9 100644 --- a/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h +++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h @@ -14,7 +14,7 @@ typedef struct fpsimd_context fpu_state_t; -struct gcs_context { +struct cr_gcs_context { struct _aarch64_ctx head; __u64 gcspr; __u64 features_enabled; @@ -23,7 +23,7 @@ struct gcs_context { struct aux_context { struct fpsimd_context fpsimd; - struct gcs_context gcs; + struct cr_gcs_context gcs; /* additional context to be added before "end" */ struct _aarch64_ctx end; }; diff --git a/compel/arch/aarch64/src/lib/infect.c b/compel/arch/aarch64/src/lib/infect.c index c7bcb2a44..b9ca00afb 100644 --- a/compel/arch/aarch64/src/lib/infect.c +++ b/compel/arch/aarch64/src/lib/infect.c @@ -51,7 +51,7 @@ static bool __compel_gcs_enabled(struct cr_user_gcs *gcs) int sigreturn_prep_regs_plain(struct rt_sigframe *sigframe, user_regs_struct_t *regs, user_fpregs_struct_t *fpregs) { struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe); - struct gcs_context *gcs = RT_SIGFRAME_GCS(sigframe); + struct cr_gcs_context *gcs = RT_SIGFRAME_GCS(sigframe); memcpy(sigframe->uc.uc_mcontext.regs, regs->regs, sizeof(regs->regs)); diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c index 2e89f9ce3..c2b6d8fcf 100644 --- a/criu/arch/aarch64/crtools.c +++ b/criu/arch/aarch64/crtools.c @@ -259,7 +259,7 @@ int restore_fpu(struct rt_sigframe *sigframe, CoreEntry *core) { int i; struct fpsimd_context *fpsimd = RT_SIGFRAME_FPU(sigframe); - struct gcs_context *gcs; + struct cr_gcs_context *gcs; if (core->ti_aarch64->fpsimd->n_vregs != 64) return 1;