History

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

Linus Torvalds committed 13 years ago

Commit 455e9872 parents 7c17e48 fd6da6923 files · +194 −135Browse files

Showing the changes to include/uapi/linux (2 of 23 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/hw_breakpoint.h +30 −0
include/uapi/linux/Kbuild+1−0
@@ -415,3 +415,4 @@ header-y += wireless.h · 414 unmodified lines
415415 header-y += x25.h
416416 header-y += xattr.h
417417 header-y += xfrm.h
418+header-y += hw_breakpoint.h
include/uapi/linux/hw_breakpoint.h+30−0
@@ -0,0 +1,30 @@
1+#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
2+#define _UAPI_LINUX_HW_BREAKPOINT_H
3+
4+enum {
5+ HW_BREAKPOINT_LEN_1 = 1,
6+ HW_BREAKPOINT_LEN_2 = 2,
7+ HW_BREAKPOINT_LEN_4 = 4,
8+ HW_BREAKPOINT_LEN_8 = 8,
9+};
10+
11+enum {
12+ HW_BREAKPOINT_EMPTY = 0,
13+ HW_BREAKPOINT_R = 1,
14+ HW_BREAKPOINT_W = 2,
15+ HW_BREAKPOINT_RW = HW_BREAKPOINT_R | HW_BREAKPOINT_W,
16+ HW_BREAKPOINT_X = 4,
17+ HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,
18+};
19+
20+enum bp_type_idx {
21+ TYPE_INST = 0,
22+#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
23+ TYPE_DATA = 0,
24+#else
25+ TYPE_DATA = 1,
26+#endif
27+ TYPE_MAX
28+};
29+
30+#endif /* _UAPI_LINUX_HW_BREAKPOINT_H */