Commit 25cd480e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools: Remove bitops/hweight usage of bits in tools/perf 



We need to use lib/hweight.c for that, just like we do for lib/rbtree.c,
so tools need to link hweight.o. For now do it directly, but we need to
have a tools/lib/lk.a or .so that collects these goodies...

Reported-by: default avatarJan Beulich <JBeulich@suse.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-a1e91dx3apzqw5kbdt7ut21s@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 260d819e

tools/include/asm-generic/bitops.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#error only <linux/bitops.h> can be included directly

#endif



#include <asm-generic/bitops/hweight.h>



#include <asm-generic/bitops/atomic.h>



#endif /* __TOOLS_ASM_GENERIC_BITOPS_H */

tools/include/asm-generic/bitops/arch_hweight.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/arch_hweight.h"

tools/include/asm-generic/bitops/const_hweight.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/const_hweight.h"

tools/include/asm-generic/bitops/hweight.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#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>



#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_HWEIGHT_H_ */

tools/include/linux/bitops.h

+6 −1
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_BITOPS_H_

#define _TOOLS_LINUX_BITOPS_H_



#include <asm/types.h>

#include <linux/kernel.h>

#include <linux/compiler.h>

#include <asm/hweight.h>



#ifndef __WORDSIZE

#define __WORDSIZE (__SIZEOF_LONG__ * 8)
@@ -19,6 +19,11 @@ 
#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

 * scope

CRA Git | Maintained and supported by SUSTech CRA and CCSE