diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 09:25:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 09:25:06 -0500 |
| commit | f0b9abfb044649bc452fb2fb975ff2fd599cc6a3 (patch) | |
| tree | 7800081c5cb16a4dfee1e57a70f3be90f7b50d9a /include/linux/kvm_host.h | |
| parent | adc1ef1e37358d3c17d1a74a58b2e104fc0bda15 (diff) | |
| parent | 1b3c393cd43f22ead8a6a2f839efc6df8ebd7465 (diff) | |
Merge branch 'linus' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/builtin-test.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 @@ | |||
| 42 | */ | 42 | */ |
| 43 | #define KVM_MEMSLOT_INVALID (1UL << 16) | 43 | #define KVM_MEMSLOT_INVALID (1UL << 16) |
| 44 | 44 | ||
| 45 | /* | 45 | /* Two fragments for cross MMIO pages. */ |
| 46 | * If we support unaligned MMIO, at most one fragment will be split into two: | 46 | #define KVM_MAX_MMIO_FRAGMENTS 2 |
| 47 | */ | ||
| 48 | #ifdef KVM_UNALIGNED_MMIO | ||
| 49 | # define KVM_EXTRA_MMIO_FRAGMENTS 1 | ||
| 50 | #else | ||
| 51 | # define KVM_EXTRA_MMIO_FRAGMENTS 0 | ||
| 52 | #endif | ||
| 53 | |||
| 54 | #define KVM_USER_MMIO_SIZE 8 | ||
| 55 | |||
| 56 | #define KVM_MAX_MMIO_FRAGMENTS \ | ||
| 57 | (KVM_MMIO_SIZE / KVM_USER_MMIO_SIZE + KVM_EXTRA_MMIO_FRAGMENTS) | ||
| 58 | 47 | ||
| 59 | /* | 48 | /* |
| 60 | * For the normal pfn, the highest 12 bits should be zero, | 49 | * For the normal pfn, the highest 12 bits should be zero, |