summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorGleb Natapov2013-04-28 11:50:07 +0200
committerGleb Natapov2013-04-28 11:50:07 +0200
commit064d1afaa5a60fc391d0b4b77599fc8f63f99cd3 (patch)
tree2e640cdfa50b0048c52e021f07a8b24560251b26 /arch/x86/include/asm
parentKVM: x86: Rework request for immediate exit (diff)
parentKVM: PPC: Book3S: Facilities to save/restore XICS presentation ctrler state (diff)
downloadkernel-qcow2-linux-064d1afaa5a60fc391d0b4b77599fc8f63f99cd3.tar.gz
kernel-qcow2-linux-064d1afaa5a60fc391d0b4b77599fc8f63f99cd3.tar.xz
kernel-qcow2-linux-064d1afaa5a60fc391d0b4b77599fc8f63f99cd3.zip
Merge git://github.com/agraf/linux-2.6.git kvm-ppc-next into queue
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/kvm_host.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 111b4a0c3907..38f2cc0a5a23 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -43,6 +43,8 @@
#define KVM_PIO_PAGE_OFFSET 1
#define KVM_COALESCED_MMIO_PAGE_OFFSET 2
+#define KVM_IRQCHIP_NUM_PINS KVM_IOAPIC_NUM_PINS
+
#define CR0_RESERVED_BITS \
(~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
| X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \