[CRIU] [PATCH v2] crtools.c: fix compilation by clang

Kir Kolyshkin kir at openvz.org
Fri May 1 14:15:23 PDT 2015


Fix the following error:

>   LINK     arch/x86/syscalls.built-in.o
> arch/x86/crtools.c:36:20: error: unused function '__check_code_syscall'
>       [-Werror,-Wunused-function]
> static inline void __check_code_syscall(void)

As the function consists of a few BUILD_BUG_ONs, it gets optimized out.
Let's add __attribute__((__unused__)) so clang stops complaining.

[v2: s/used/unused/, fix all the arches, whitespace cleanup]

Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 arch/aarch64/crtools.c | 3 +--
 arch/arm/crtools.c     | 3 +--
 arch/x86/crtools.c     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/aarch64/crtools.c b/arch/aarch64/crtools.c
index 13668cd..90af289 100644
--- a/arch/aarch64/crtools.c
+++ b/arch/aarch64/crtools.c
@@ -30,13 +30,12 @@ const char code_syscall[] = {
 
 const int code_syscall_size = round_up(sizeof(code_syscall), sizeof(long));
 
-static inline void __check_code_syscall(void)
+static inline void __always_unused __check_code_syscall(void)
 {
 	BUILD_BUG_ON(sizeof(code_syscall) != BUILTIN_SYSCALL_SIZE);
 	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
 }
 
-
 void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
 {
 	regs->pc = new_ip;
diff --git a/arch/arm/crtools.c b/arch/arm/crtools.c
index a5420b1..b692a7f 100644
--- a/arch/arm/crtools.c
+++ b/arch/arm/crtools.c
@@ -30,13 +30,12 @@ const char code_syscall[] = {
 
 const int code_syscall_size = round_up(sizeof(code_syscall), sizeof(long));
 
-static inline void __check_code_syscall(void)
+static inline __always_unused void __check_code_syscall(void)
 {
 	BUILD_BUG_ON(sizeof(code_syscall) != BUILTIN_SYSCALL_SIZE);
 	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
 }
 
-
 void parasite_setup_regs(unsigned long new_ip, void *stack, user_regs_struct_t *regs)
 {
 	regs->ARM_pc = new_ip;
diff --git a/arch/x86/crtools.c b/arch/x86/crtools.c
index d721ac8..5ecb609 100644
--- a/arch/x86/crtools.c
+++ b/arch/x86/crtools.c
@@ -33,7 +33,7 @@ const char code_syscall[] = {
 
 const int code_syscall_size = round_up(sizeof(code_syscall), sizeof(long));
 
-static inline void __check_code_syscall(void)
+static inline __always_unused void __check_code_syscall(void)
 {
 	BUILD_BUG_ON(sizeof(code_syscall) != BUILTIN_SYSCALL_SIZE);
 	BUILD_BUG_ON(!is_log2(sizeof(code_syscall)));
-- 
1.9.3



More information about the CRIU mailing list