diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-08 08:51:52 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-08 08:51:52 -0800 |
| commit | fa8e2458ecfc959cd627e25ba86d8eddcb63c887 (patch) | |
| tree | d8c9dec3dac8e97e8591e6507a619959449d6344 /include/linux/kvm_host.h | |
| parent | d56a289be2ce01d1aa426a6cf45dede14a8db41e (diff) | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
| download | cachepc-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.tar.gz cachepc-linux-fa8e2458ecfc959cd627e25ba86d8eddcb63c887.zip | |
Merge tag 'v3.7-rc4' into next to sync up Wacom bits
Linux 3.7-rc4
Diffstat (limited to 'include/linux/kvm_host.h')
| -rw-r--r-- | include/linux/kvm_host.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 93bfc9f9815c..ecc554374e44 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -42,19 +42,8 @@ */ #define KVM_MEMSLOT_INVALID (1UL << 16) -/* - * If we support unaligned MMIO, at most one fragment will be split into two: - */ -#ifdef KVM_UNALIGNED_MMIO -# define KVM_EXTRA_MMIO_FRAGMENTS 1 -#else -# define KVM_EXTRA_MMIO_FRAGMENTS 0 -#endif - -#define KVM_USER_MMIO_SIZE 8 - -#define KVM_MAX_MMIO_FRAGMENTS \ - (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS) +/* Two fragments for cross MMIO pages. */ +#define KVM_MAX_MMIO_FRAGMENTS 2 /* * For the normal pfn, the highest 12 bits should be zero, |