Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf tools: Don't use code surrounded by __KERNEL__ 



We need to refactor code to be explicitely shared by the kernel and at
least the tools/ userspace programs, so, till we do that, copy the bare
minimum bitmap/bitops code needed by tools/perf.

Reported-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bc4b473f

tools/perf/Makefile

+1 −15
Original line number Diff line number Diff line
@@ -377,9 +377,9 @@ LIB_H += util/include/linux/rbtree.h 
LIB_H += util/include/linux/string.h

LIB_H += util/include/linux/types.h

LIB_H += util/include/asm/asm-offsets.h

LIB_H += util/include/asm/bitops.h

LIB_H += util/include/asm/bug.h

LIB_H += util/include/asm/byteorder.h

LIB_H += util/include/asm/hweight.h

LIB_H += util/include/asm/swab.h

LIB_H += util/include/asm/system.h

LIB_H += util/include/asm/uaccess.h
@@ -435,7 +435,6 @@ LIB_OBJS += $(OUTPUT)util/path.o 
LIB_OBJS += $(OUTPUT)util/rbtree.o

LIB_OBJS += $(OUTPUT)util/bitmap.o

LIB_OBJS += $(OUTPUT)util/hweight.o

LIB_OBJS += $(OUTPUT)util/find_next_bit.o

LIB_OBJS += $(OUTPUT)util/run-command.o

LIB_OBJS += $(OUTPUT)util/quote.o

LIB_OBJS += $(OUTPUT)util/strbuf.o
@@ -948,19 +947,6 @@ $(OUTPUT)util/config.o: util/config.c $(OUTPUT)PERF-CFLAGS 
$(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



# some perf warning policies can't fit to lib/bitmap.c, eg: it warns about variable shadowing

# from <string.h> that comes from kernel headers wrapping.

KBITMAP_FLAGS=`echo $(ALL_CFLAGS) | sed s/-Wshadow// | sed s/-Wswitch-default// | sed s/-Wextra//`



$(OUTPUT)util/bitmap.o: ../../lib/bitmap.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(KBITMAP_FLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/hweight.o: ../../lib/hweight.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/find_next_bit.o: ../../lib/find_next_bit.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<



$(OUTPUT)util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $<

tools/perf/util/bitmap.c

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * From lib/bitmap.c

 * Helper functions for bitmap.h.

 *

 * This source code is licensed under the GNU General Public License,

 * Version 2.  See the file COPYING for more details.

 */

#include <linux/bitmap.h>



int __bitmap_weight(const unsigned long *bitmap, int bits)

{

	int k, w = 0, lim = bits/BITS_PER_LONG;



	for (k = 0; k < lim; k++)

		w += hweight_long(bitmap[k]);



	if (bits % BITS_PER_LONG)

		w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));



	return w;

}

tools/perf/util/hweight.c

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#include <linux/bitops.h>



/**

 * hweightN - returns the hamming weight of a N-bit word

 * @x: the word to weigh

 *

 * The Hamming Weight of a number is the total number of bits set in it.

 */



unsigned int hweight32(unsigned int w)

{

	unsigned int res = w - ((w >> 1) & 0x55555555);

	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);

	res = (res + (res >> 4)) & 0x0F0F0F0F;

	res = res + (res >> 8);

	return (res + (res >> 16)) & 0x000000FF;

}



unsigned long hweight64(__u64 w)

{

#if BITS_PER_LONG == 32

	return hweight32((unsigned int)(w >> 32)) + hweight32((unsigned int)w);

#elif BITS_PER_LONG == 64

	__u64 res = w - ((w >> 1) & 0x5555555555555555ul);

	res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);

	res = (res + (res >> 4)) & 0x0F0F0F0F0F0F0F0Ful;

	res = res + (res >> 8);

	res = res + (res >> 16);

	return (res + (res >> 32)) & 0x00000000000000FFul;

#endif

}

tools/perf/util/include/asm/bitops.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
#ifndef _PERF_ASM_BITOPS_H_

#define _PERF_ASM_BITOPS_H_



#include <sys/types.h>

#include "../../types.h"

#include <linux/compiler.h>



/* CHECKME: Not sure both always match */

#define BITS_PER_LONG	__WORDSIZE



#include "../../../../include/asm-generic/bitops/__fls.h"

#include "../../../../include/asm-generic/bitops/fls.h"

#include "../../../../include/asm-generic/bitops/fls64.h"

#include "../../../../include/asm-generic/bitops/__ffs.h"

#include "../../../../include/asm-generic/bitops/ffz.h"

#include "../../../../include/asm-generic/bitops/hweight.h"



#endif

tools/perf/util/include/asm/hweight.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef PERF_HWEIGHT_H

#define PERF_HWEIGHT_H



#include <linux/types.h>

unsigned int hweight32(unsigned int w);

unsigned long hweight64(__u64 w);



#endif /* PERF_HWEIGHT_H */