Commit 6aaba7c9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-2' of... 

Merge tag 'perf-core-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

- The mmap address range for the ring buffer now is calculated using the
  contents of /proc/sys/kernel/perf_event_mlock_kb.

  This fixes an -EPERM case where 'trace' was trying to use more than what
  is configured on perf_event_mlock_kb. (Arnaldo Carvalho de Melo)

Infrastructure changes:

- Move bitops definitions so that they match the header file hierarchy
  in the kernel sources where that code came from. (Arnaldo Carvalho de Melo)

- Adopt round{down,up}_pow_of_two from the kernel and use it instead of
  equivalent code, so that we reuse more kernel code and make tools/ look
  more like kernel source code, to encourage further contributions from
  kernel hackers (Arnaldo Carvalho de Melo)

- Fix use after free in filename__read_build_id (Mitchell Krome)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 41e950c0 7ad74b41

tools/include/asm-generic/bitops.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef __TOOLS_ASM_GENERIC_BITOPS_H

#define __TOOLS_ASM_GENERIC_BITOPS_H



/*

 * tools/ copied this from include/asm-generic/bitops.h, bit by bit as it needed

 * some functions.

 *

 * For the benefit of those who are trying to port Linux to another

 * architecture, here are some C-language equivalents.  You should

 * recode these in the native assembly language, if at all possible.

 *

 * C language equivalents written by Theodore Ts'o, 9/26/92

 */



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

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

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

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

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



#ifndef _TOOLS_LINUX_BITOPS_H_

#error only <linux/bitops.h> can be included directly

#endif



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



#endif /* __TOOLS_ASM_GENERIC_BITOPS_H */

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_

#define _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_



#include <asm/types.h>



/**

 * __ffs - find first bit in word.

 * @word: The word to search

 *

 * Undefined if no bit exists, so code should check against 0 first.

 */

static __always_inline unsigned long __ffs(unsigned long word)

{

	int num = 0;



#if __BITS_PER_LONG == 64

	if ((word & 0xffffffff) == 0) {

		num += 32;

		word >>= 32;

	}

#endif

	if ((word & 0xffff) == 0) {

		num += 16;

		word >>= 16;

	}

	if ((word & 0xff) == 0) {

		num += 8;

		word >>= 8;

	}

	if ((word & 0xf) == 0) {

		num += 4;

		word >>= 4;

	}

	if ((word & 0x3) == 0) {

		num += 2;

		word >>= 2;

	}

	if ((word & 0x1) == 0)

		num += 1;

	return num;

}



#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_ */

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

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include <../../../../include/asm-generic/bitops/__fls.h>

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_

#define _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_



#include <asm/types.h>



static inline void set_bit(int nr, unsigned long *addr)

{

	addr[nr / __BITS_PER_LONG] |= 1UL << (nr % __BITS_PER_LONG);

}



static inline void clear_bit(int nr, unsigned long *addr)

{

	addr[nr / __BITS_PER_LONG] &= ~(1UL << (nr % __BITS_PER_LONG));

}



static __always_inline int test_bit(unsigned int nr, const unsigned long *addr)

{

	return ((1UL << (nr % __BITS_PER_LONG)) &

		(((unsigned long *)addr)[nr / __BITS_PER_LONG])) != 0;

}



#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS_ATOMIC_H_ */

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_

#define _TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_



#ifndef find_next_bit

/**

 * find_next_bit - find the next set bit in a memory region

 * @addr: The address to base the search on

 * @offset: The bitnumber to start searching at

 * @size: The bitmap size in bits

 *

 * Returns the bit number for the next set bit

 * If no bits are set, returns @size.

 */

extern unsigned long find_next_bit(const unsigned long *addr, unsigned long

		size, unsigned long offset);

#endif



#ifndef find_first_bit



/**

 * find_first_bit - find the first set bit in a memory region

 * @addr: The address to start the search at

 * @size: The maximum number of bits to search

 *

 * Returns the bit number of the first set bit.

 * If no bits are set, returns @size.

 */

extern unsigned long find_first_bit(const unsigned long *addr,

				    unsigned long size);



#endif /* find_first_bit */



#endif /*_TOOLS_LINUX_ASM_GENERIC_BITOPS_FIND_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE