diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:09:27 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:09:27 +0100 |
commit | ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (patch) | |
tree | dce8c1a21347cd12b44ed56af4aafc2a58c9ec08 /tools/objtool | |
parent | Merge branch 'perf/urgent' into perf/core, to pick up fixes (diff) | |
parent | x86: kprobes: Prohibit probing on instruction which has emulate prefix (diff) | |
download | linux-dev-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.tar.xz linux-dev-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.zip |
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/objtool')
-rwxr-xr-x | tools/objtool/sync-check.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh index 0a832e265a50..9bd04bbed01e 100755 --- a/tools/objtool/sync-check.sh +++ b/tools/objtool/sync-check.sh @@ -4,6 +4,7 @@ FILES=' arch/x86/include/asm/inat_types.h arch/x86/include/asm/orc_types.h +arch/x86/include/asm/emulate_prefix.h arch/x86/lib/x86-opcode-map.txt arch/x86/tools/gen-insn-attr-x86.awk ' @@ -46,6 +47,6 @@ done 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[\">]"' cd - |