diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2018-10-09 16:13:20 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2018-10-09 16:13:20 +1100 |
| commit | 9d67121a4fce20e0f7f127d40cd824fbbf5297dc (patch) | |
| tree | efa49480305a12813bc37f06f233656da127d7cd /tools | |
| parent | aa2278644ae54ff762ce33f9c9563d759e9cca9f (diff) | |
| parent | 83a055104eaf89589582659737ff5bf6eed63ac4 (diff) | |
| download | linux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.tar.gz linux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.tar.bz2 linux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.zip | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the "ppc-kvm" topic branch of the powerpc tree to get a
series of commits that touch both general arch/powerpc code and KVM
code. These commits will be merged both via the KVM tree and the
powerpc tree.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/arch/powerpc/util/book3s_hv_exits.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/arch/powerpc/util/book3s_hv_exits.h b/tools/perf/arch/powerpc/util/book3s_hv_exits.h index 853b95d1e139..2011376c7ab5 100644 --- a/tools/perf/arch/powerpc/util/book3s_hv_exits.h +++ b/tools/perf/arch/powerpc/util/book3s_hv_exits.h @@ -15,7 +15,6 @@ {0x400, "INST_STORAGE"}, \ {0x480, "INST_SEGMENT"}, \ {0x500, "EXTERNAL"}, \ - {0x501, "EXTERNAL_LEVEL"}, \ {0x502, "EXTERNAL_HV"}, \ {0x600, "ALIGNMENT"}, \ {0x700, "PROGRAM"}, \ |