diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/ia64/include/asm/kvm_host.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/ia64/include/asm/kvm_host.h')
| -rw-r--r-- | arch/ia64/include/asm/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h index d9b6325a932..a362e67e0ca 100644 --- a/arch/ia64/include/asm/kvm_host.h +++ b/arch/ia64/include/asm/kvm_host.h | |||
| @@ -475,7 +475,6 @@ struct kvm_arch { | |||
| 475 | struct list_head assigned_dev_head; | 475 | struct list_head assigned_dev_head; |
| 476 | struct iommu_domain *iommu_domain; | 476 | struct iommu_domain *iommu_domain; |
| 477 | int iommu_flags; | 477 | int iommu_flags; |
| 478 | struct hlist_head irq_ack_notifier_list; | ||
| 479 | 478 | ||
| 480 | unsigned long irq_sources_bitmap; | 479 | unsigned long irq_sources_bitmap; |
| 481 | unsigned long irq_states[KVM_IOAPIC_NUM_PINS]; | 480 | unsigned long irq_states[KVM_IOAPIC_NUM_PINS]; |