Merge tag 'v3.13-rc1' into asoc-arizona

Linux 3.13-rc1

1 files changed, 7 insertions, 5 deletions

diff --git a/include/linux/msi.h b/include/linux/msi.h
index b17ead818aec..009b02481436 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -26,11 +26,11 @@ struct msi_desc {
         struct {
                 __u8    is_msix : 1;
                 __u8    multiple: 3;    /* log2 number of messages */
-                __u8    maskbit : 1;    /* mask-pending bit supported ?   */
-                __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit  */
-                __u8    pos;            /* Location of the msi capability */
-                __u16   entry_nr;       /* specific enabled entry         */
-                unsigned default_irq;   /* default pre-assigned irq       */
+                __u8    maskbit : 1;    /* mask-pending bit supported ? */
+                __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit */
+                __u8    pos;            /* Location of the msi capability */
+                __u16   entry_nr;       /* specific enabled entry */
+                unsigned default_irq;   /* default pre-assigned irq */
         } msi_attrib;
 
         u32 masked;                     /* mask bits */
@@ -64,6 +64,8 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq);
 
 void default_teardown_msi_irqs(struct pci_dev *dev);
 void default_restore_msi_irqs(struct pci_dev *dev, int irq);
+u32 default_msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
+u32 default_msix_mask_irq(struct msi_desc *desc, u32 flag);
 
 struct msi_chip {
         struct module *owner;