diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-04-28 05:50:07 -0400 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-04-28 05:50:07 -0400 |
| commit | 064d1afaa5a60fc391d0b4b77599fc8f63f99cd3 (patch) | |
| tree | 2e640cdfa50b0048c52e021f07a8b24560251b26 /arch/x86/kvm/x86.c | |
| parent | 730dca42c1d363c939da18c1499c7327c66e2b37 (diff) | |
| parent | 8b78645c93b5d469e8006d68dbc92edc2640c654 (diff) | |
Merge git://github.com/agraf/linux-2.6.git kvm-ppc-next into queue
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c522260b5bbf..145b1c81011b 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
| @@ -2522,7 +2522,6 @@ int kvm_dev_ioctl_check_extension(long ext) | |||
| 2522 | case KVM_CAP_PCI_2_3: | 2522 | case KVM_CAP_PCI_2_3: |
| 2523 | case KVM_CAP_KVMCLOCK_CTRL: | 2523 | case KVM_CAP_KVMCLOCK_CTRL: |
| 2524 | case KVM_CAP_READONLY_MEM: | 2524 | case KVM_CAP_READONLY_MEM: |
| 2525 | case KVM_CAP_IRQFD_RESAMPLE: | ||
| 2526 | r = 1; | 2525 | r = 1; |
| 2527 | break; | 2526 | break; |
| 2528 | case KVM_CAP_COALESCED_MMIO: | 2527 | case KVM_CAP_COALESCED_MMIO: |