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

Commit d01de238 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

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

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - Fix segfault when using both the map symtab viewer and annotation
    in the TUI (Namhyung Kim).

  - uClibc build fixes (Alexey Brodkin, Vineet Gupta).

  - bitops/hweight were moved from tools/perf/ too tools/include, move
    some leftovers (Arnaldo Carvalho de Melo)

  - Fix dwarf unwind x86_64 build error (Namhyung Kim)

  - Fix __machine__findnew_thread() error path (Namhyung Kim)

  - Propagate error code when write(2) failed in 'perf probe' (Namhyung Kim)

  - Use dwfl_report_elf() instead of offline in powerpc bits to
    properly handle non prelinked DSOs (Sukadev Bhattiprolu).

  - Fix dwarf unwind using libunwind in 'perf test' (Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 33636732 6bcf9c1f

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