diff options
author | Avi Kivity <avi@qumranet.com> | 2007-02-12 03:54:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:40 -0500 |
commit | 8cd133073f9b5cd335c0b2e4740aceb025d50ca9 (patch) | |
tree | 9cbfc34b90769163c75788d15ded022127791ee5 | |
parent | 26bb83a755593a53bd248e20d699b0c813f1e238 (diff) |
[PATCH] kvm: Fix mismatch between 32-bit and 64-bit abi
Unfortunately requiring a version bump.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/kvm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 6a5f6f49e037..f3604593fb76 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <asm/types.h> | 11 | #include <asm/types.h> |
12 | #include <linux/ioctl.h> | 12 | #include <linux/ioctl.h> |
13 | 13 | ||
14 | #define KVM_API_VERSION 2 | 14 | #define KVM_API_VERSION 3 |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Architectural interrupt line count, and the size of the bitmap needed | 17 | * Architectural interrupt line count, and the size of the bitmap needed |
@@ -187,6 +187,7 @@ struct kvm_translation { | |||
187 | __u8 valid; | 187 | __u8 valid; |
188 | __u8 writeable; | 188 | __u8 writeable; |
189 | __u8 usermode; | 189 | __u8 usermode; |
190 | __u8 pad[5]; | ||
190 | }; | 191 | }; |
191 | 192 | ||
192 | /* for KVM_INTERRUPT */ | 193 | /* for KVM_INTERRUPT */ |