Update PCIe driver to support newer kernel & udev versions

abyszuk · Apr 15, 2013 · 697fb43 · 697fb43
1 parent 469a25a
commit 697fb43
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/drivers/pcie/etc/udev/rules.d/60-udev_fpga.rules b/drivers/pcie/etc/udev/rules.d/60-udev_fpga.rules
@@ -1,3 +1,3 @@
 # Permissions for the fpga devices
 
-KERNEL="fpga*", OWNER="root", GROUP="users", MODE="660"
+KERNEL=="fpga*", OWNER="root", GROUP="users", MODE="660"
diff --git a/drivers/pcie/src/base.c b/drivers/pcie/src/base.c
@@ -291,7 +291,7 @@ static struct pci_driver pcidriver_driver = {
  * @param pdev Pointer to the PCI device
  *
  */
-static int __devinit pcidriver_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int pcidriver_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	int err;
 	int devno;
@@ -424,7 +424,7 @@ static int __devinit pcidriver_probe(struct pci_dev *pdev, const struct pci_devi
  * This function is called when disconnecting a device
  *
  */
-static void __devexit pcidriver_remove(struct pci_dev *pdev)
+static void pcidriver_remove(struct pci_dev *pdev)
 {
 	pcidriver_privdata_t *privdata;
 

diff --git a/drivers/pcie/src/base.h b/drivers/pcie/src/base.h
@@ -18,10 +18,8 @@ int pcidriver_release(struct inode *inode, struct file *filp);
 
 /* prototypes for device operations */
 static struct pci_driver pcidriver_driver;
-static int __devinit pcidriver_probe(struct pci_dev *pdev, const struct pci_device_id *id);
-static void __devexit pcidriver_remove(struct pci_dev *pdev);
-
-
+static int pcidriver_probe(struct pci_dev *pdev, const struct pci_device_id *id);
+static void pcidriver_remove(struct pci_dev *pdev);
 
 /* prototypes for module operations */
 static int __init pcidriver_init(void);

diff --git a/drivers/pcie/src/kmem.c b/drivers/pcie/src/kmem.c
@@ -24,6 +24,10 @@
 #include "kmem.h"			/* prototypes for kernel memory */
 #include "sysfs.h"			/* prototypes for sysfs */
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
+#define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
+#endif
+
 /**
  *
  * Allocates new kernel memory including the corresponding management structure, makes