| Message ID | 1687336748-4898-2-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Unify uapi bitsperlong.h | expand |
Hi Tiezhu, kernel test robot noticed the following build warnings: [auto build test WARNING on arnd-asm-generic/master] [also build test WARNING on soc/for-next arm64/for-next/core linus/master v6.4-rc7 next-20230621] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Tiezhu-Yang/asm-generic-Unify-uapi-bitsperlong-h-for-arm64-riscv-and-loongarch/20230621-172223 base: https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git master patch link: https://lore.kernel.org/r/1687336748-4898-2-git-send-email-yangtiezhu%40loongson.cn patch subject: [PATCH v2 1/2] asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch config: x86_64-rhel-8.3-rust (https://download.01.org/0day-ci/archive/20230622/202306220334.C80BpATp-lkp@intel.com/config) compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a) reproduce: (https://download.01.org/0day-ci/archive/20230622/202306220334.C80BpATp-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306220334.C80BpATp-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from lib/kunit/test.c:9: In file included from include/kunit/resource.h:12: In file included from include/kunit/test.h:12: In file included from include/kunit/assert.h:12: In file included from include/linux/err.h:5: In file included from include/linux/compiler.h:246: In file included from ./arch/x86/include/generated/asm/rwonce.h:1: In file included from include/asm-generic/rwonce.h:26: In file included from include/linux/kasan-checks.h:5: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ 1 warning generated. -- >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined], err: false -- In file included from lib/decompress_inflate.c:21: In file included from include/linux/zutil.h:17: In file included from include/linux/string.h:5: In file included from include/linux/compiler.h:246: In file included from ./arch/x86/include/generated/asm/rwonce.h:1: In file included from include/asm-generic/rwonce.h:26: In file included from include/linux/kasan-checks.h:5: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/decompress_inflate.c:42:17: warning: no previous prototype for function '__gunzip' [-Wmissing-prototypes] STATIC int INIT __gunzip(unsigned char *buf, long len, ^ lib/decompress_inflate.c:42:8: note: declare 'static' if the function is not intended to be used outside of this translation unit STATIC int INIT __gunzip(unsigned char *buf, long len, ^ static 2 warnings generated. -- In file included from lib/decompress_unxz.c:107: In file included from include/linux/decompress/mm.h:79: In file included from include/linux/kernel.h:16: In file included from include/linux/limits.h:6: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/decompress_unxz.c:251:17: warning: no previous prototype for function 'unxz' [-Wmissing-prototypes] STATIC int INIT unxz(unsigned char *in, long in_size, ^ lib/decompress_unxz.c:251:8: note: declare 'static' if the function is not intended to be used outside of this translation unit STATIC int INIT unxz(unsigned char *in, long in_size, ^ static 2 warnings generated. -- In file included from lib/decompress_unzstd.c:74: In file included from include/linux/decompress/mm.h:79: In file included from include/linux/kernel.h:16: In file included from include/linux/limits.h:6: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/decompress_unzstd.c:331:17: warning: no previous prototype for function 'unzstd' [-Wmissing-prototypes] STATIC int INIT unzstd(unsigned char *buf, long len, ^ lib/decompress_unzstd.c:331:8: note: declare 'static' if the function is not intended to be used outside of this translation unit STATIC int INIT unzstd(unsigned char *buf, long len, ^ static 2 warnings generated. -- In file included from lib/maple_tree.c:54: In file included from include/linux/maple_tree.h:11: In file included from include/linux/kernel.h:16: In file included from include/linux/limits.h:6: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/maple_tree.c:331:21: warning: unused function 'mte_set_full' [-Wunused-function] static inline void *mte_set_full(const struct maple_enode *node) ^ lib/maple_tree.c:336:21: warning: unused function 'mte_clear_full' [-Wunused-function] static inline void *mte_clear_full(const struct maple_enode *node) ^ lib/maple_tree.c:341:20: warning: unused function 'mte_has_null' [-Wunused-function] static inline bool mte_has_null(const struct maple_enode *node) ^ 4 warnings generated. -- In file included from lib/radix-tree.c:12: In file included from include/linux/bitmap.h:8: In file included from include/linux/bitops.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/radix-tree.c:288:6: warning: no previous prototype for function 'radix_tree_node_rcu_free' [-Wmissing-prototypes] void radix_tree_node_rcu_free(struct rcu_head *head) ^ lib/radix-tree.c:288:1: note: declare 'static' if the function is not intended to be used outside of this translation unit void radix_tree_node_rcu_free(struct rcu_head *head) ^ static lib/radix-tree.c:1134:50: warning: parameter 'slot' set but not used [-Wunused-but-set-parameter] void __rcu **radix_tree_iter_resume(void __rcu **slot, ^ 3 warnings generated. -- In file included from lib/zstd/compress/huf_compress.c:23: In file included from lib/zstd/compress/../common/zstd_deps.h:29: In file included from include/linux/limits.h:6: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/zstd/compress/huf_compress.c:471:16: warning: unused function 'HUF_isSorted' [-Wunused-function] MEM_STATIC int HUF_isSorted(nodeElt huffNode[], U32 const maxSymbolValue1) { ^ 2 warnings generated. -- In file included from lib/zstd/compress/zstd_lazy.c:11: In file included from lib/zstd/compress/zstd_compress_internal.h:21: In file included from lib/zstd/compress/../common/zstd_internal.h:23: In file included from lib/zstd/compress/../common/cpu.h:19: In file included from lib/zstd/compress/../common/mem.h:18: In file included from ./arch/x86/include/generated/asm/unaligned.h:1: In file included from include/asm-generic/unaligned.h:9: In file included from include/linux/unaligned/packed_struct.h:4: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/zstd/compress/zstd_lazy.c:835:16: warning: unused function 'ZSTD_isAligned' [-Wunused-function] MEM_STATIC int ZSTD_isAligned(void const* ptr, size_t align) { ^ 2 warnings generated. -- In file included from arch/x86/kernel/cpu/common.c:5: In file included from include/linux/memblock.h:11: In file included from include/linux/init.h:5: In file included from include/linux/build_bug.h:5: In file included from include/linux/compiler.h:246: In file included from ./arch/x86/include/generated/asm/rwonce.h:1: In file included from include/asm-generic/rwonce.h:26: In file included from include/linux/kasan-checks.h:5: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ arch/x86/kernel/cpu/common.c:366:19: warning: unused function 'flag_is_changeable_p' [-Wunused-function] static inline int flag_is_changeable_p(u32 flag) ^ 2 warnings generated. -- In file included from lib/mpi/mpi-inv.c:20: In file included from lib/mpi/mpi-internal.h:20: In file included from include/linux/module.h:12: In file included from include/linux/list.h:5: In file included from include/linux/container_of.h:5: In file included from include/linux/build_bug.h:5: In file included from include/linux/compiler.h:246: In file included from ./arch/x86/include/generated/asm/rwonce.h:1: In file included from include/asm-generic/rwonce.h:26: In file included from include/linux/kasan-checks.h:5: In file included from include/linux/types.h:6: In file included from include/uapi/linux/types.h:5: In file included from ./arch/x86/include/generated/uapi/asm/types.h:1: In file included from include/uapi/asm-generic/types.h:7: In file included from include/asm-generic/int-ll64.h:11: In file included from include/uapi/asm-generic/int-ll64.h:12: In file included from arch/x86/include/uapi/asm/bitsperlong.h:11: In file included from include/asm-generic/bitsperlong.h:5: >> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) ^ arch/x86/include/uapi/asm/bitsperlong.h:6:10: note: previous definition is here # define __BITS_PER_LONG 64 ^ lib/mpi/mpi-inv.c:34:15: warning: variable 'k' set but not used [-Wunused-but-set-variable] unsigned int k; ^ 2 warnings generated. .. vim +/__BITS_PER_LONG +13 include/uapi/asm-generic/bitsperlong.h 4 5 /* 6 * In order to keep safe and avoid regression, only unify uapi 7 * bitsperlong.h for some archs which are using newer toolchains 8 * that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__. 9 * See the following link for more info: 10 * https://lore.kernel.org/linux-arch/b9624545-2c80-49a1-ac3c-39264a591f7b@app.fastmail.com/ 11 */ 12 #if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__) > 13 #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) 14 #else 15 /* 16 * There seems to be no way of detecting this automatically from user 17 * space, so 64 bit architectures should override this in their 18 * bitsperlong.h. In particular, an architecture that supports 19 * both 32 and 64 bit user space must not rely on CONFIG_64BIT 20 * to decide it, but rather check a compiler provided macro. 21 */ 22 #ifndef __BITS_PER_LONG 23 #define __BITS_PER_LONG 32 24 #endif 25 #endif 26
On 06/22/2023 04:04 AM, kernel test robot wrote: > Hi Tiezhu, > > kernel test robot noticed the following build warnings: > ... > In file included from include/asm-generic/bitsperlong.h:5: >>> include/uapi/asm-generic/bitsperlong.h:13:9: warning: '__BITS_PER_LONG' macro redefined [-Wmacro-redefined] Oh, thanks for the report, I am sorry. In order to silence the build warning, it should check the definition of __BITS_PER_LONG first at the beginning of bitsperlong.h, like this: #ifndef __BITS_PER_LONG #if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__) #define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) #else #define __BITS_PER_LONG 32 #endif #endif I will test and then send v3 later. Thanks, Tiezhu
diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h deleted file mode 100644 index 485d60be..0000000 --- a/arch/arm64/include/uapi/asm/bitsperlong.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef __ASM_BITSPERLONG_H -#define __ASM_BITSPERLONG_H - -#define __BITS_PER_LONG 64 - -#include <asm-generic/bitsperlong.h> - -#endif /* __ASM_BITSPERLONG_H */ diff --git a/arch/loongarch/include/uapi/asm/bitsperlong.h b/arch/loongarch/include/uapi/asm/bitsperlong.h deleted file mode 100644 index 00b4ba1..0000000 --- a/arch/loongarch/include/uapi/asm/bitsperlong.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __ASM_LOONGARCH_BITSPERLONG_H -#define __ASM_LOONGARCH_BITSPERLONG_H - -#define __BITS_PER_LONG (__SIZEOF_LONG__ * 8) - -#include <asm-generic/bitsperlong.h> - -#endif /* __ASM_LOONGARCH_BITSPERLONG_H */ diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h deleted file mode 100644 index 7d0b32e..0000000 --- a/arch/riscv/include/uapi/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ -/* - * Copyright (C) 2012 ARM Ltd. - * Copyright (C) 2015 Regents of the University of California - */ - -#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H -#define _UAPI_ASM_RISCV_BITSPERLONG_H - -#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) - -#include <asm-generic/bitsperlong.h> - -#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */ diff --git a/include/uapi/asm-generic/bitsperlong.h b/include/uapi/asm-generic/bitsperlong.h index 693d9a4..0f2d225 100644 --- a/include/uapi/asm-generic/bitsperlong.h +++ b/include/uapi/asm-generic/bitsperlong.h @@ -3,6 +3,16 @@ #define _UAPI__ASM_GENERIC_BITS_PER_LONG /* + * In order to keep safe and avoid regression, only unify uapi + * bitsperlong.h for some archs which are using newer toolchains + * that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__. + * See the following link for more info: + * https://lore.kernel.org/linux-arch/b9624545-2c80-49a1-ac3c-39264a591f7b@app.fastmail.com/ + */ +#if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__) +#define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) +#else +/* * There seems to be no way of detecting this automatically from user * space, so 64 bit architectures should override this in their * bitsperlong.h. In particular, an architecture that supports @@ -12,5 +22,6 @@ #ifndef __BITS_PER_LONG #define __BITS_PER_LONG 32 #endif +#endif #endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */ diff --git a/tools/arch/arm64/include/uapi/asm/bitsperlong.h b/tools/arch/arm64/include/uapi/asm/bitsperlong.h deleted file mode 100644 index 485d60be..0000000 --- a/tools/arch/arm64/include/uapi/asm/bitsperlong.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#ifndef __ASM_BITSPERLONG_H -#define __ASM_BITSPERLONG_H - -#define __BITS_PER_LONG 64 - -#include <asm-generic/bitsperlong.h> - -#endif /* __ASM_BITSPERLONG_H */ diff --git a/tools/arch/loongarch/include/uapi/asm/bitsperlong.h b/tools/arch/loongarch/include/uapi/asm/bitsperlong.h deleted file mode 100644 index 00b4ba1..0000000 --- a/tools/arch/loongarch/include/uapi/asm/bitsperlong.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __ASM_LOONGARCH_BITSPERLONG_H -#define __ASM_LOONGARCH_BITSPERLONG_H - -#define __BITS_PER_LONG (__SIZEOF_LONG__ * 8) - -#include <asm-generic/bitsperlong.h> - -#endif /* __ASM_LOONGARCH_BITSPERLONG_H */ diff --git a/tools/arch/riscv/include/uapi/asm/bitsperlong.h b/tools/arch/riscv/include/uapi/asm/bitsperlong.h deleted file mode 100644 index 0b9b58b..0000000 --- a/tools/arch/riscv/include/uapi/asm/bitsperlong.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2012 ARM Ltd. - * Copyright (C) 2015 Regents of the University of California - */ - -#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H -#define _UAPI_ASM_RISCV_BITSPERLONG_H - -#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) - -#include <asm-generic/bitsperlong.h> - -#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */ diff --git a/tools/include/uapi/asm-generic/bitsperlong.h b/tools/include/uapi/asm-generic/bitsperlong.h index 23e6c41..0f2d225 100644 --- a/tools/include/uapi/asm-generic/bitsperlong.h +++ b/tools/include/uapi/asm-generic/bitsperlong.h @@ -1,7 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _UAPI__ASM_GENERIC_BITS_PER_LONG #define _UAPI__ASM_GENERIC_BITS_PER_LONG /* + * In order to keep safe and avoid regression, only unify uapi + * bitsperlong.h for some archs which are using newer toolchains + * that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__. + * See the following link for more info: + * https://lore.kernel.org/linux-arch/b9624545-2c80-49a1-ac3c-39264a591f7b@app.fastmail.com/ + */ +#if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__) +#define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__) +#else +/* * There seems to be no way of detecting this automatically from user * space, so 64 bit architectures should override this in their * bitsperlong.h. In particular, an architecture that supports @@ -11,5 +22,6 @@ #ifndef __BITS_PER_LONG #define __BITS_PER_LONG 32 #endif +#endif #endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */ diff --git a/tools/include/uapi/asm/bitsperlong.h b/tools/include/uapi/asm/bitsperlong.h index da52065..c65267a 100644 --- a/tools/include/uapi/asm/bitsperlong.h +++ b/tools/include/uapi/asm/bitsperlong.h @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #if defined(__i386__) || defined(__x86_64__) #include "../../../arch/x86/include/uapi/asm/bitsperlong.h" -#elif defined(__aarch64__) -#include "../../../arch/arm64/include/uapi/asm/bitsperlong.h" #elif defined(__powerpc__) #include "../../../arch/powerpc/include/uapi/asm/bitsperlong.h" #elif defined(__s390__) @@ -13,12 +11,8 @@ #include "../../../arch/mips/include/uapi/asm/bitsperlong.h" #elif defined(__ia64__) #include "../../../arch/ia64/include/uapi/asm/bitsperlong.h" -#elif defined(__riscv) -#include "../../../arch/riscv/include/uapi/asm/bitsperlong.h" #elif defined(__alpha__) #include "../../../arch/alpha/include/uapi/asm/bitsperlong.h" -#elif defined(__loongarch__) -#include "../../../arch/loongarch/include/uapi/asm/bitsperlong.h" #else #include <asm-generic/bitsperlong.h> #endif
Now we specify the minimal version of GCC as 5.1 and Clang/LLVM as 11.0.0 in Documentation/process/changes.rst, __CHAR_BIT__ and __SIZEOF_LONG__ are usable, it is probably fine to unify the definition of __BITS_PER_LONG as (__CHAR_BIT__ * __SIZEOF_LONG__) in asm-generic uapi bitsperlong.h. In order to keep safe and avoid regression, only unify uapi bitsperlong.h for some archs such as arm64, riscv and loongarch which are using newer toolchains that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__. Suggested-by: Xi Ruoyao <xry111@xry111.site> Link: https://lore.kernel.org/all/d3e255e4746de44c9903c4433616d44ffcf18d1b.camel@xry111.site/ Suggested-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/linux-arch/a3a4f48a-07d4-4ed9-bc53-5d383428bdd2@app.fastmail.com/ Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> --- arch/arm64/include/uapi/asm/bitsperlong.h | 24 ---------------------- arch/loongarch/include/uapi/asm/bitsperlong.h | 9 -------- arch/riscv/include/uapi/asm/bitsperlong.h | 14 ------------- include/uapi/asm-generic/bitsperlong.h | 11 ++++++++++ tools/arch/arm64/include/uapi/asm/bitsperlong.h | 24 ---------------------- .../arch/loongarch/include/uapi/asm/bitsperlong.h | 9 -------- tools/arch/riscv/include/uapi/asm/bitsperlong.h | 14 ------------- tools/include/uapi/asm-generic/bitsperlong.h | 12 +++++++++++ tools/include/uapi/asm/bitsperlong.h | 6 ------ 9 files changed, 23 insertions(+), 100 deletions(-) delete mode 100644 arch/arm64/include/uapi/asm/bitsperlong.h delete mode 100644 arch/loongarch/include/uapi/asm/bitsperlong.h delete mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/arm64/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/loongarch/include/uapi/asm/bitsperlong.h delete mode 100644 tools/arch/riscv/include/uapi/asm/bitsperlong.h