diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-12-06 16:41:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-06 16:45:24 -0500 |
| commit | 34c9ca37aaec2e307b837bb099d3b44f0ea04ddc (patch) | |
| tree | 6837858dbe3941951fdf59395de217e21db0e54c | |
| parent | d6eabce2577a695197e9433302fd6a9f0e1a7666 (diff) | |
tooling/headers: Synchronize updated s390 and x86 UAPI headers
There were two trivial updates to these upstream UAPI headers:
arch/s390/include/uapi/asm/kvm.h
arch/s390/include/uapi/asm/kvm_perf.h
arch/x86/lib/x86-opcode-map.txt
Synchronize them with their tooling copies.
(The x86 opcode map includes a new instruction pattern now.)
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/arch/s390/include/uapi/asm/kvm.h | 4 | ||||
| -rw-r--r-- | tools/arch/s390/include/uapi/asm/kvm_perf.h | 4 | ||||
| -rw-r--r-- | tools/perf/util/intel-pt-decoder/x86-opcode-map.txt | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/tools/arch/s390/include/uapi/asm/kvm.h b/tools/arch/s390/include/uapi/asm/kvm.h index 9ad172dcd912..38535a57fef8 100644 --- a/tools/arch/s390/include/uapi/asm/kvm.h +++ b/tools/arch/s390/include/uapi/asm/kvm.h | |||
| @@ -6,10 +6,6 @@ | |||
| 6 | * | 6 | * |
| 7 | * Copyright IBM Corp. 2008 | 7 | * Copyright IBM Corp. 2008 |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | ||
| 10 | * it under the terms of the GNU General Public License (version 2 only) | ||
| 11 | * as published by the Free Software Foundation. | ||
| 12 | * | ||
| 13 | * Author(s): Carsten Otte <cotte@de.ibm.com> | 9 | * Author(s): Carsten Otte <cotte@de.ibm.com> |
| 14 | * Christian Borntraeger <borntraeger@de.ibm.com> | 10 | * Christian Borntraeger <borntraeger@de.ibm.com> |
| 15 | */ | 11 | */ |
diff --git a/tools/arch/s390/include/uapi/asm/kvm_perf.h b/tools/arch/s390/include/uapi/asm/kvm_perf.h index c36c97ffdc6f..84606b8cc49e 100644 --- a/tools/arch/s390/include/uapi/asm/kvm_perf.h +++ b/tools/arch/s390/include/uapi/asm/kvm_perf.h | |||
| @@ -4,10 +4,6 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright 2014 IBM Corp. | 5 | * Copyright 2014 IBM Corp. |
| 6 | * Author(s): Alexander Yarygin <yarygin@linux.vnet.ibm.com> | 6 | * Author(s): Alexander Yarygin <yarygin@linux.vnet.ibm.com> |
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License (version 2 only) | ||
| 10 | * as published by the Free Software Foundation. | ||
| 11 | */ | 7 | */ |
| 12 | 8 | ||
| 13 | #ifndef __LINUX_KVM_PERF_S390_H | 9 | #ifndef __LINUX_KVM_PERF_S390_H |
diff --git a/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt b/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt index 12e377184ee4..c4d55919fac1 100644 --- a/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt +++ b/tools/perf/util/intel-pt-decoder/x86-opcode-map.txt | |||
| @@ -896,7 +896,7 @@ EndTable | |||
| 896 | 896 | ||
| 897 | GrpTable: Grp3_1 | 897 | GrpTable: Grp3_1 |
| 898 | 0: TEST Eb,Ib | 898 | 0: TEST Eb,Ib |
| 899 | 1: | 899 | 1: TEST Eb,Ib |
| 900 | 2: NOT Eb | 900 | 2: NOT Eb |
| 901 | 3: NEG Eb | 901 | 3: NEG Eb |
| 902 | 4: MUL AL,Eb | 902 | 4: MUL AL,Eb |
