Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-17 16:47:50 +00:00
Code Issues Projects Releases Wiki Activity

compel/arm64: rename gcs_context to avoid conflicts with system headers

Browse source 
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 <avagin@google.com>
This commit is contained in:
Andrei Vagin 2026-06-25 21:36:25 +00:00 • committed by Andrei Vagin
parent 6e858d1446
commit fb1e63b8b2
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
View file

@ -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;
};

2
compel/arch/aarch64/src/lib/infect.c
View file

@ -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));

2
criu/arch/aarch64/crtools.c
View file

@ -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;