diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2013-04-16 20:49:47 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2013-04-16 20:49:47 -0300 |
| commit | 23125c40e0a701c80046f8c05d5aae48c704c78c (patch) | |
| tree | 2cdaf026ea384e6d3e1ce3531d6da598cfefd04c /arch/arm/kvm/arm.c | |
| parent | 4d2be6f7c75e814ee28b007dbf0c26dfcbbe20a1 (diff) | |
| parent | 865499ea90d399e0682bcce3ae7af24277633699 (diff) | |
Merge branch 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm
* 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm:
ARM: KVM: fix L_PTE_S2_RDWR to actually be Read/Write
ARM: KVM: fix KVM_CAP_ARM_SET_DEVICE_ADDR reporting
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/arm/kvm/arm.c')
| -rw-r--r-- | arch/arm/kvm/arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 5a936988eb2..c1fe498983a 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -201,6 +201,7 @@ int kvm_dev_ioctl_check_extension(long ext) break; case KVM_CAP_ARM_SET_DEVICE_ADDR: r = 1; + break; case KVM_CAP_NR_VCPUS: r = num_online_cpus(); break; |