summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-02-12 00:54:41 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 09:48:40 -0800
commit8cd133073f9b5cd335c0b2e4740aceb025d50ca9 (patch)
tree9cbfc34b90769163c75788d15ded022127791ee5
parent26bb83a755593a53bd248e20d699b0c813f1e238 (diff)
downloadblackbird-op-linux-8cd133073f9b5cd335c0b2e4740aceb025d50ca9.tar.gz
blackbird-op-linux-8cd133073f9b5cd335c0b2e4740aceb025d50ca9.zip
[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.h3
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 @@
#include <asm/types.h>
#include <linux/ioctl.h>
-#define KVM_API_VERSION 2
+#define KVM_API_VERSION 3
/*
* Architectural interrupt line count, and the size of the bitmap needed
@@ -187,6 +187,7 @@ struct kvm_translation {
__u8 valid;
__u8 writeable;
__u8 usermode;
+ __u8 pad[5];
};
/* for KVM_INTERRUPT */
OpenPOWER on IntegriCloud