git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
virt
/
kvm
/
assigned-dev.c
diff --git
a/virt/kvm/assigned-dev.c
b/virt/kvm/assigned-dev.c
index
6cc4b97
..
4e9eaeb
100644
(file)
--- a/
virt/kvm/assigned-dev.c
+++ b/
virt/kvm/assigned-dev.c
@@
-617,7
+617,7
@@
static int kvm_vm_ioctl_set_msix_nr(struct kvm *kvm,
if (adev->entries_nr == 0) {
adev->entries_nr = entry_nr->entry_nr;
if (adev->entries_nr == 0 ||
- adev->entries_nr >
=
KVM_MAX_MSIX_PER_DEV) {
+ adev->entries_nr > KVM_MAX_MSIX_PER_DEV) {
r = -EINVAL;
goto msix_nr_out;
}