git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
include
/
asm
/
kvm.h
diff --git
a/arch/ia64/include/asm/kvm.h
b/arch/ia64/include/asm/kvm.h
index 18a7e49abbc5ec7ebd445ba6b785263c2193602a..bc90c75adf6716f8423fe92935fa9fbd7be89cf2 100644
(file)
--- a/
arch/ia64/include/asm/kvm.h
+++ b/
arch/ia64/include/asm/kvm.h
@@
-60,6
+60,7
@@
struct kvm_ioapic_state {
#define KVM_IRQCHIP_PIC_MASTER 0
#define KVM_IRQCHIP_PIC_SLAVE 1
#define KVM_IRQCHIP_IOAPIC 2
+#define KVM_NR_IRQCHIPS 3
#define KVM_CONTEXT_SIZE 8*1024