There are no definitions for __sw_hweight*, so no point in keeping the prototypes around. The scripts version of the header also ultimately tries to access non-existing normal headers, so fix that up as well. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- include/linux/bitops.h | 5 ----- scripts/include/asm-generic/bitops/arch_hweight.h | 1 - scripts/include/asm-generic/bitops/const_hweight.h | 1 - scripts/include/asm-generic/bitops/hweight.h | 3 +-- scripts/include/linux/bitops.h | 4 ---- 5 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 scripts/include/asm-generic/bitops/arch_hweight.h delete mode 100644 scripts/include/asm-generic/bitops/const_hweight.h diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 31345c219d33..dd13bf93118c 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -24,11 +24,6 @@ #define GENMASK_ULL(h, l) \ (((~0ULL) << (l)) & (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h)))) -extern unsigned int __sw_hweight8(unsigned int w); -extern unsigned int __sw_hweight16(unsigned int w); -extern unsigned int __sw_hweight32(unsigned int w); -extern unsigned long __sw_hweight64(__u64 w); - /* * Include this here because some architectures need generic_ffs/fls in * scope diff --git a/scripts/include/asm-generic/bitops/arch_hweight.h b/scripts/include/asm-generic/bitops/arch_hweight.h deleted file mode 100644 index 318bb2b202b0..000000000000 --- a/scripts/include/asm-generic/bitops/arch_hweight.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../../include/asm-generic/bitops/arch_hweight.h" diff --git a/scripts/include/asm-generic/bitops/const_hweight.h b/scripts/include/asm-generic/bitops/const_hweight.h deleted file mode 100644 index 0afd644aff83..000000000000 --- a/scripts/include/asm-generic/bitops/const_hweight.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../../include/asm-generic/bitops/const_hweight.h" diff --git a/scripts/include/asm-generic/bitops/hweight.h b/scripts/include/asm-generic/bitops/hweight.h index 290120c01a8e..eb95ca33d5c0 100644 --- a/scripts/include/asm-generic/bitops/hweight.h +++ b/scripts/include/asm-generic/bitops/hweight.h @@ -1,7 +1,6 @@ #ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ #define _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ -#include <asm-generic/bitops/arch_hweight.h> -#include <asm-generic/bitops/const_hweight.h> +#include "../../../../include/asm-generic/bitops/hweight.h" #endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ */ diff --git a/scripts/include/linux/bitops.h b/scripts/include/linux/bitops.h index 5ad9ee1dd7f6..c9ec614e0db6 100644 --- a/scripts/include/linux/bitops.h +++ b/scripts/include/linux/bitops.h @@ -19,10 +19,6 @@ #define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) #define BITS_TO_BYTES(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE) -extern unsigned int __sw_hweight8(unsigned int w); -extern unsigned int __sw_hweight16(unsigned int w); -extern unsigned int __sw_hweight32(unsigned int w); -extern unsigned long __sw_hweight64(__u64 w); /* * Include this here because some architectures need generic_ffs/fls in -- 2.30.2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
