summaryrefslogtreecommitdiffstats
path: root/Documentation/virtual
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@ozlabs.org>2018-10-09 16:13:20 +1100
committerPaul Mackerras <paulus@ozlabs.org>2018-10-09 16:13:20 +1100
commit9d67121a4fce20e0f7f127d40cd824fbbf5297dc (patch)
treeefa49480305a12813bc37f06f233656da127d7cd /Documentation/virtual
parentaa2278644ae54ff762ce33f9c9563d759e9cca9f (diff)
parent83a055104eaf89589582659737ff5bf6eed63ac4 (diff)
downloadlinux-9d67121a4fce20e0f7f127d40cd824fbbf5297dc.tar.bz2
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 'Documentation/virtual')
-rw-r--r--Documentation/virtual/kvm/api.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index 647f94128a85..2f5f9b743bff 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -1922,6 +1922,7 @@ registers, find a list below:
PPC | KVM_REG_PPC_TIDR | 64
PPC | KVM_REG_PPC_PSSCR | 64
PPC | KVM_REG_PPC_DEC_EXPIRY | 64
+ PPC | KVM_REG_PPC_PTCR | 64
PPC | KVM_REG_PPC_TM_GPR0 | 64
...
PPC | KVM_REG_PPC_TM_GPR31 | 64