1 files changed, 23 insertions, 4 deletions

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 57693498519c..7669941cc9d2 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -181,19 +181,38 @@ struct x86_platform_ops {
 };
 
 struct pci_dev;
+struct msi_msg;
 
 struct x86_msi_ops {
         int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
+        void (*compose_msi_msg)(struct pci_dev *dev, unsigned int irq,
+                                unsigned int dest, struct msi_msg *msg,
+                               u8 hpet_id);
         void (*teardown_msi_irq)(unsigned int irq);
         void (*teardown_msi_irqs)(struct pci_dev *dev);
         void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
+        int  (*setup_hpet_msi)(unsigned int irq, unsigned int id);
 };
 
+struct IO_APIC_route_entry;
+struct io_apic_irq_attr;
+struct irq_data;
+struct cpumask;
+
 struct x86_io_apic_ops {
-        void            (*init)  (void);
-        unsigned int    (*read)  (unsigned int apic, unsigned int reg);
-        void            (*write) (unsigned int apic, unsigned int reg, unsigned int value);
-        void            (*modify)(unsigned int apic, unsigned int reg, unsigned int value);
+        void            (*init)   (void);
+        unsigned int    (*read)   (unsigned int apic, unsigned int reg);
+        void            (*write)  (unsigned int apic, unsigned int reg, unsigned int value);
+        void            (*modify) (unsigned int apic, unsigned int reg, unsigned int value);
+        void            (*disable)(void);
+        void            (*print_entries)(unsigned int apic, unsigned int nr_entries);
+        int             (*set_affinity)(struct irq_data *data,
+                                        const struct cpumask *mask,
+                                        bool force);
+        int             (*setup_entry)(int irq, struct IO_APIC_route_entry *entry,
+                                       unsigned int destination, int vector,
+                                       struct io_apic_irq_attr *attr);
+        void            (*eoi_ioapic_pin)(int apic, int pin, int vector);
 };
 
 extern struct x86_init_ops x86_init;