Merge branch 'busybox' into merge

1 files changed, 9 insertions, 0 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 9055ed066..e5000831f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -423,6 +423,13 @@ extern int *BB_GLOBAL_CONST bb_errno;
 uint64_t bb_bswap_64(uint64_t x) FAST_FUNC;
 #endif
 
+unsigned FAST_FUNC bb_popcnt_32(uint32_t m);
+#if ULONG_MAX > 0xffffffff
+unsigned FAST_FUNC bb_popcnt_long(unsigned long m);
+#else
+#define bb_popcnt_long(m) bb_popcnt_32(m)
+#endif
+
 unsigned long FAST_FUNC isqrt(unsigned long long N);
 
 unsigned long long monotonic_ns(void) FAST_FUNC;
@@ -2103,6 +2110,8 @@ int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
         read_line_input(prompt, command, maxsize)
 #endif
 
+unsigned long* FAST_FUNC get_malloc_cpu_affinity(int pid, unsigned *sz);
+
 #if ENABLE_PLATFORM_MINGW32
 # undef COMM_LEN
 # define COMM_LEN 32