locks: add lock cancel command

[linux-2.6] / include / linux / msi.h

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 74c8a2ecc9dd0769e172f3f0469f0b1bb26ebf16..e38fe6822cb4d0974c5f0dd29357f22538dc8bc1 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -17,7 +17,7 @@ struct msi_desc {
        struct {
                __u8    type    : 5;    /* {0: unused, 5h:MSI, 11h:MSI-X} */
                __u8    maskbit : 1;    /* mask-pending bit supported ?   */
-               __u8    unused  : 1;
+               __u8    masked  : 1;
                __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit  */
                __u8    pos;            /* Location of the msi capability */
                __u16   entry_nr;       /* specific enabled entry         */
@@ -32,10 +32,8 @@ struct msi_desc {
        void __iomem *mask_base;
        struct pci_dev *dev;
 
-#ifdef CONFIG_PM
-       /* PM save area for MSIX address/data */
-       struct msi_msg msg_save;
-#endif
+       /* Last set MSI message */
+       struct msi_msg msg;
 };
 
 /*