projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[platform/upstream/kernel-adaptation-pc.git]
/
arch
/
arm
/
kvm
/
arm.c
diff --git
a/arch/arm/kvm/arm.c
b/arch/arm/kvm/arm.c
index
5bc99b4
..
37d216d
100644
(file)
--- a/
arch/arm/kvm/arm.c
+++ b/
arch/arm/kvm/arm.c
@@
-199,6
+199,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;