rdma.m4: Update pci_bus_speed/width test

[~tnikolova/compat/.git] / include / linux / compat-3.12.h

diff --git a/include/linux/compat-3.12.h b/include/linux/compat-3.12.h
index 4890819..7f06dfd 100644 (file)
--- a/include/linux/compat-3.12.h
+++ b/include/linux/compat-3.12.h
@@ -4,15 +4,40 @@
 #include <linux/version.h>
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0))
+#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 
-#define PTR_ERR_OR_ZERO LINUX_BACKPORT(PTR_ERR_OR_ZERO)
-static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
+#ifndef PTR_ERR_OR_ZERO
+#define PTR_ERR_OR_ZERO(p) PTR_RET(p)
+#endif
+
+#define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)
+
+#define file_inode LINUX_BACKPORT(file_inode)
+static inline struct inode *file_inode(struct file *f)
 {
-       if (IS_ERR(ptr))
-               return PTR_ERR(ptr);
-       else
-               return 0;
+       return f->f_dentry->d_inode;
 }
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) */
 
+#ifndef HAVE_PCIE_LINK_WIDTH
+/* These values come from the PCI Express Spec */
+enum pcie_link_width {
+       PCIE_LNK_WIDTH_RESRV    = 0x00,
+       PCIE_LNK_X1             = 0x01,
+       PCIE_LNK_X2             = 0x02,
+       PCIE_LNK_X4             = 0x04,
+       PCIE_LNK_X8             = 0x08,
+       PCIE_LNK_X12            = 0x0C,
+       PCIE_LNK_X16            = 0x10,
+       PCIE_LNK_X32            = 0x20,
+       PCIE_LNK_WIDTH_UNKNOWN  = 0xFF,
+};
+#endif
+
+extern const unsigned char pcie_link_speed[];
+
+#define pcie_get_minimum_link LINUX_BACKPORT(pcie_get_minimum_link)
+int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed,
+               enum pcie_link_width *width);
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)) */
 #endif /* LINUX_3_12_COMPAT_H */