patch-2.3.29 linux/arch/i386/kernel/pci-i386.c

• Lines: 28
• Date: Tue Nov 23 10:10:38 1999
• Orig file: v2.3.28/linux/arch/i386/kernel/pci-i386.c
• Orig date: Fri Oct 22 13:21:45 1999

diff -u --recursive --new-file v2.3.28/linux/arch/i386/kernel/pci-i386.c linux/arch/i386/kernel/pci-i386.c
@@ -122,12 +122,12 @@
 			printk(KERN_ERR "PCI: I/O Region %s/%d too large (%ld bytes)\n", dev->slot_name, i, size);
 			return -EFBIG;
 		}
-		if (allocate_resource(pr, r, size, 0x1000, ~0, 1024)) {
+		if (allocate_resource(pr, r, size, 0x1000, ~0, 1024, dev)) {
 			printk(KERN_ERR "PCI: Allocation of I/O region %s/%d (%ld bytes) failed\n", dev->slot_name, i, size);
 			return -EBUSY;
 		}
 	} else {
-		if (allocate_resource(pr, r, size, 0x10000000, ~0, size)) {
+		if (allocate_resource(pr, r, size, 0x10000000, ~0, size, dev)) {
 			printk(KERN_ERR "PCI: Allocation of memory region %s/%d (%ld bytes) failed\n", dev->slot_name, i, size);
 			return -EBUSY;
 		}
@@ -291,6 +291,12 @@
 	pcibios_allocate_resources(0);
 	pcibios_allocate_resources(1);
 	pcibios_assign_resources();
+}
+
+unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
+			     unsigned long start, unsigned long size)
+{
+	return start;
 }
 
 int pcibios_enable_resources(struct pci_dev *dev)