Merge ../linux-2.6

1 files changed, 32 insertions, 1 deletions

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 0aad5a378e95..3a6a4e37a482 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -97,7 +97,13 @@ enum pci_channel_state {
 
 typedef unsigned short __bitwise pci_bus_flags_t;
 enum pci_bus_flags {
-        PCI_BUS_FLAGS_NO_MSI = (pci_bus_flags_t) 1,
+        PCI_BUS_FLAGS_NO_MSI = (__force pci_bus_flags_t) 1,
+};
+
+struct pci_cap_saved_state {
+        struct hlist_node next;
+        char cap_nr;
+        u32 data[0];
 };
 
 /*
@@ -159,6 +165,7 @@ struct pci_dev {
         unsigned int    block_ucfg_access:1;    /* userspace config space access is blocked */
 
         u32             saved_config_space[16]; /* config space saved at suspend time */
+        struct hlist_head saved_cap_space;
         struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */
         int rom_attr_enabled;           /* has display of the rom attribute been enabled? */
         struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
@@ -169,6 +176,30 @@ struct pci_dev {
 #define to_pci_dev(n) container_of(n, struct pci_dev, dev)
 #define for_each_pci_dev(d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
 
+static inline struct pci_cap_saved_state *pci_find_saved_cap(
+        struct pci_dev *pci_dev,char cap)
+{
+        struct pci_cap_saved_state *tmp;
+        struct hlist_node *pos;
+
+        hlist_for_each_entry(tmp, pos, &pci_dev->saved_cap_space, next) {
+                if (tmp->cap_nr == cap)
+                        return tmp;
+        }
+        return NULL;
+}
+
+static inline void pci_add_saved_cap(struct pci_dev *pci_dev,
+        struct pci_cap_saved_state *new_cap)
+{
+        hlist_add_head(&new_cap->next, &pci_dev->saved_cap_space);
+}
+
+static inline void pci_remove_saved_cap(struct pci_cap_saved_state *cap)
+{
+        hlist_del(&cap->next);
+}
+
 /*
  *  For PCI devices, the region numbers are assigned this way:
  *