Commit 455e987c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "This is mostly about unbreaking architectures that took the UAPI
  changes in the v3.7 cycle, plus misc fixes."

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf kvm: Fix building perf kvm on non x86 arches
  perf kvm: Rename perf_kvm to perf_kvm_stat
  perf: Make perf build for x86 with UAPI disintegration applied
  perf powerpc: Use uapi/unistd.h to fix build error
  tools: Pass the target in descend
  tools: Honour the O= flag when tool build called from a higher Makefile
  tools: Define a Makefile function to do subdir processing
  x86: Export asm/{svm.h,vmx.h,perf_regs.h}
  perf tools: Fix strbuf_addf() when the buffer needs to grow
  perf header: Fix numa topology printing
  perf, powerpc: Fix hw breakpoints returning -ENOSPC
parents 7c17e486 fd6da696

Makefile

+4 −2
Original line number Diff line number Diff line
@@ -1321,10 +1321,12 @@ kernelversion: 


# Clear a bunch of variables before executing the submake

tools/: FORCE

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/



tools/%: FORCE

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= -C $(src)/tools/ $*

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ $*



# Single targets

# ---------------------------------------------------------------------------

arch/x86/include/asm/Kbuild

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ header-y += mce.h 
header-y += msr-index.h

header-y += msr.h

header-y += mtrr.h

header-y += perf_regs.h

header-y += posix_types_32.h

header-y += posix_types_64.h

header-y += posix_types_x32.h
@@ -19,8 +20,10 @@ header-y += prctl.h 
header-y += processor-flags.h

header-y += ptrace-abi.h

header-y += sigcontext32.h

header-y += svm.h

header-y += ucontext.h

header-y += vm86.h

header-y += vmx.h

header-y += vsyscall.h



genhdr-y += unistd_32.h

include/linux/hw_breakpoint.h

+1 −30
Original line number Diff line number Diff line 
#ifndef _LINUX_HW_BREAKPOINT_H

#define _LINUX_HW_BREAKPOINT_H



enum {

	HW_BREAKPOINT_LEN_1 = 1,

	HW_BREAKPOINT_LEN_2 = 2,

	HW_BREAKPOINT_LEN_4 = 4,

	HW_BREAKPOINT_LEN_8 = 8,

};



enum {

	HW_BREAKPOINT_EMPTY	= 0,

	HW_BREAKPOINT_R		= 1,

	HW_BREAKPOINT_W		= 2,

	HW_BREAKPOINT_RW	= HW_BREAKPOINT_R | HW_BREAKPOINT_W,

	HW_BREAKPOINT_X		= 4,

	HW_BREAKPOINT_INVALID   = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,

};



enum bp_type_idx {

	TYPE_INST 	= 0,

#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS

	TYPE_DATA	= 0,

#else

	TYPE_DATA	= 1,

#endif

	TYPE_MAX

};



#ifdef __KERNEL__



#include <linux/perf_event.h>

#include <uapi/linux/hw_breakpoint.h>



#ifdef CONFIG_HAVE_HW_BREAKPOINT
@@ -151,6 +124,4 @@ static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp) 
}



#endif /* CONFIG_HAVE_HW_BREAKPOINT */

#endif /* __KERNEL__ */



#endif /* _LINUX_HW_BREAKPOINT_H */

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -415,3 +415,4 @@ header-y += wireless.h 
header-y += x25.h

header-y += xattr.h

header-y += xfrm.h

header-y += hw_breakpoint.h

include/uapi/linux/hw_breakpoint.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_LINUX_HW_BREAKPOINT_H

#define _UAPI_LINUX_HW_BREAKPOINT_H



enum {

	HW_BREAKPOINT_LEN_1 = 1,

	HW_BREAKPOINT_LEN_2 = 2,

	HW_BREAKPOINT_LEN_4 = 4,

	HW_BREAKPOINT_LEN_8 = 8,

};



enum {

	HW_BREAKPOINT_EMPTY	= 0,

	HW_BREAKPOINT_R		= 1,

	HW_BREAKPOINT_W		= 2,

	HW_BREAKPOINT_RW	= HW_BREAKPOINT_R | HW_BREAKPOINT_W,

	HW_BREAKPOINT_X		= 4,

	HW_BREAKPOINT_INVALID   = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,

};



enum bp_type_idx {

	TYPE_INST 	= 0,

#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS

	TYPE_DATA	= 0,

#else

	TYPE_DATA	= 1,

#endif

	TYPE_MAX

};



#endif /* _UAPI_LINUX_HW_BREAKPOINT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE