summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2021-10-30 16:17:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2021-11-01 10:08:38 +0100
commit547333d3c27882bae37ee5833d2dac6f31c29c97 (patch)
tree5c72522fb0dad22a8ec8e2f8a8994e5fb569612a
parent7cc3427c894847f3e43bc43b5aa0bd3cf460a2cc (diff)
downloadbarebox-547333d3c27882bae37ee5833d2dac6f31c29c97.tar.gz
barebox-547333d3c27882bae37ee5833d2dac6f31c29c97.tar.xz
include: <linux/bitops.h>: discard left-over hweight code
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@pengutronix.de> Link: https://lore.barebox.org/20211030141739.2207431-1-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/linux/bitops.h5
-rw-r--r--scripts/include/asm-generic/bitops/arch_hweight.h1
-rw-r--r--scripts/include/asm-generic/bitops/const_hweight.h1
-rw-r--r--scripts/include/asm-generic/bitops/hweight.h3
-rw-r--r--scripts/include/linux/bitops.h4
5 files changed, 1 insertions, 13 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 31345c219d..dd13bf9311 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 318bb2b202..0000000000
--- 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 0afd644aff..0000000000
--- 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 290120c01a..eb95ca33d5 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 5ad9ee1dd7..c9ec614e0d 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