From 2a60b4974cc2cd1d2bd567030568f5721bd5cde3 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 30 Mar 2022 18:22:22 -0700 Subject: [PATCH] Rename useable to usable I am not sure if this is going to bring any compatibility issues. If yes, we need to remove this patch and add "useable" to the list of ignored words instead. Signed-off-by: Kir Kolyshkin --- compel/arch/x86/plugins/include/asm/syscall-types.h | 2 +- criu/arch/x86/include/asm/dump.h | 2 +- criu/arch/x86/include/asm/restore.h | 2 +- images/core-x86.proto | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compel/arch/x86/plugins/include/asm/syscall-types.h b/compel/arch/x86/plugins/include/asm/syscall-types.h index 101d1eb6e..6987aad16 100644 --- a/compel/arch/x86/plugins/include/asm/syscall-types.h +++ b/compel/arch/x86/plugins/include/asm/syscall-types.h @@ -53,7 +53,7 @@ typedef struct { unsigned int read_exec_only : 1; unsigned int limit_in_pages : 1; unsigned int seg_not_present : 1; - unsigned int useable : 1; + unsigned int usable : 1; unsigned int lm : 1; } user_desc_t; diff --git a/criu/arch/x86/include/asm/dump.h b/criu/arch/x86/include/asm/dump.h index 03715e003..192f6bd02 100644 --- a/criu/arch/x86/include/asm/dump.h +++ b/criu/arch/x86/include/asm/dump.h @@ -25,7 +25,7 @@ static inline void core_put_tls(CoreEntry *core, tls_t tls) COPY_TLS(read_exec_only); COPY_TLS(limit_in_pages); COPY_TLS(seg_not_present); - COPY_TLS(useable); + COPY_TLS(usable); #undef COPY_TLS } } diff --git a/criu/arch/x86/include/asm/restore.h b/criu/arch/x86/include/asm/restore.h index 7cb725d98..addf716a4 100644 --- a/criu/arch/x86/include/asm/restore.h +++ b/criu/arch/x86/include/asm/restore.h @@ -49,7 +49,7 @@ static inline void core_get_tls(CoreEntry *pcore, tls_t *ptls) COPY_TLS(read_exec_only); COPY_TLS(limit_in_pages); COPY_TLS(seg_not_present); - COPY_TLS(useable); + COPY_TLS(usable); #undef COPY_TLS } } diff --git a/images/core-x86.proto b/images/core-x86.proto index ee7be8ff1..77932ab42 100644 --- a/images/core-x86.proto +++ b/images/core-x86.proto @@ -99,7 +99,7 @@ message user_desc_t { required bool read_exec_only = 7 [default = true]; required bool limit_in_pages = 8; required bool seg_not_present = 9 [default = true]; - required bool useable = 10; + required bool usable = 10; } message thread_info_x86 {