diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-01 08:27:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-01 08:27:02 -0700 |
| commit | 8c23f406c6d86808726ace580657186bc3b44587 (patch) | |
| tree | 4a319a6d9b7c37166f10bd8d8af5e5f78b6abb12 /include/linux | |
| parent | 1e207eb1c3f0e8b690401f02fe08e7b53903f010 (diff) | |
| parent | 87da7e66a40532b743cd50972fcf85a1f15b14ea (diff) | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fix from Marcelo Tosatti.
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: fix vcpu->mmio_fragments overflow
Diffstat (limited to 'include/linux')
| -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, |