projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.29' into core/header-fixes
[linux-drm-fsl-dcu.git]
/
arch
/
ia64
/
include
/
asm
/
kvm.h
diff --git
a/arch/ia64/include/asm/kvm.h
b/arch/ia64/include/asm/kvm.h
index 116761ca462d88ff3236b725d15db3425b941a7d..2b0a38e847059fd18d995a01eff7ac178adda084 100644
(file)
--- a/
arch/ia64/include/asm/kvm.h
+++ b/
arch/ia64/include/asm/kvm.h
@@
-24,6
+24,10
@@
#include <linux/types.h>
#include <linux/ioctl.h>
+/* Select x86 specific features in <linux/kvm.h> */
+#define __KVM_HAVE_IOAPIC
+#define __KVM_HAVE_DEVICE_ASSIGNMENT
+
/* Architectural interrupt line count. */
#define KVM_NR_INTERRUPTS 256