diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 11:09:27 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 11:09:27 +0300 |
| commit | ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (patch) | |
| tree | dce8c1a21347cd12b44ed56af4aafc2a58c9ec08 /tools/perf | |
| parent | c494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (diff) | |
| parent | 004e8dce9c5595697951f7cd0e9f66b35c92265e (diff) | |
| download | linux-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.tar.xz | |
Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed topic tree
Conflicts:
tools/perf/check-headers.sh
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf')
| -rwxr-xr-x | tools/perf/check-headers.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index 48290a0c917c..a1dc16724352 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -28,6 +28,7 @@ arch/x86/include/asm/disabled-features.h arch/x86/include/asm/required-features.h arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/inat_types.h +arch/x86/include/asm/emulate_prefix.h arch/x86/include/asm/irq_vectors.h arch/x86/include/asm/msr-index.h arch/x86/include/uapi/asm/prctl.h @@ -118,7 +119,7 @@ check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include <linux/export.h>" -B check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' -check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]"' +check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' # diff non-symmetric files check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl |