diff options
| author | Shannon Zhao <shannon.zhao@linaro.org> | 2015-07-07 17:25:48 +0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-07 09:01:19 -0700 |
| commit | a32844ca3a02130d9c0166b65f54696dfaafc922 (patch) | |
| tree | 6a34ec6ceeadc6d7acd64befd90e4eb9a2db8774 /Documentation | |
| parent | c1c767d29bb2390308a35b69957b874e9446fe3b (diff) | |
| parent | a0768244828d0da096ce957616150220da607be1 (diff) | |
Merge tag 'v3.14.47' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14linux-linaro-lsk-v3.14-test
Conflicts:
arch/arm/include/asm/kvm_mmu.h
arch/arm/kvm/mmu.c
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_mmu.h
virt/kvm/arm/vgic.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/virtual/kvm/api.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 651caaf3dfa2..d30a4de3dd4e 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -2350,7 +2350,8 @@ should be created before this ioctl is invoked. Possible features: - KVM_ARM_VCPU_POWER_OFF: Starts the CPU in a power-off state. - Depends on KVM_CAP_ARM_PSCI. + Depends on KVM_CAP_ARM_PSCI. If not set, the CPU will be powered on + and execute guest code when KVM_RUN is called. - KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode. Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only). |