diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/x86/kvm/irq.h | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'arch/x86/kvm/irq.h')
-rw-r--r-- | arch/x86/kvm/irq.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h index 2d03568e949..53e2d084bff 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h | |||
@@ -66,11 +66,9 @@ struct kvm_pic { | |||
66 | struct kvm *kvm; | 66 | struct kvm *kvm; |
67 | struct kvm_kpic_state pics[2]; /* 0 is master pic, 1 is slave pic */ | 67 | struct kvm_kpic_state pics[2]; /* 0 is master pic, 1 is slave pic */ |
68 | int output; /* intr from master PIC */ | 68 | int output; /* intr from master PIC */ |
69 | struct kvm_io_device dev_master; | 69 | struct kvm_io_device dev; |
70 | struct kvm_io_device dev_slave; | ||
71 | struct kvm_io_device dev_eclr; | ||
72 | void (*ack_notifier)(void *opaque, int irq); | 70 | void (*ack_notifier)(void *opaque, int irq); |
73 | unsigned long irq_states[PIC_NUM_PINS]; | 71 | unsigned long irq_states[16]; |
74 | }; | 72 | }; |
75 | 73 | ||
76 | struct kvm_pic *kvm_create_pic(struct kvm *kvm); | 74 | struct kvm_pic *kvm_create_pic(struct kvm *kvm); |