diff options
| author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2002-05-06 20:27:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-06 20:27:41 -0700 |
| commit | 5d0a8965aea93bd799ebcd671e562d90f3ec2711 (patch) | |
| tree | 910fedf4b6d9802a700151efb2355fdaf252cb5b /include/linux/pci.h | |
| parent | 8a3d0b80edc3f9fa9766a2c46cbefd7954602408 (diff) | |
[PATCH] 2.5.14: New PCI allocation code (alpha, arm, parisc) [2/2]
Summary of changes:
- alpha, arm: code related to PCI-PCI bridges from pcibios_fixup_bus()
removed - now it's generic;
- pdev_sort_resource: sort resources all together, no matter IO or memory;
- pbus_assign_resources_sorted: ditto;
- pci_bridge_check_ranges, pci_setup_bridge: changed for prefetch support;
- pbus_size_io, pbus_size_mem: core stuff; tested with randomly generated
sets of resources;
- pbus_size_bridges: pass #2 (pass #1 is PCI probing, common for all archs);
- pbus_assign_resources: pass #3.
Ivan.
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 65a5a3bcfcdb..d138ba50a678 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -464,9 +464,9 @@ struct pci_ops { struct pbus_set_ranges_data { - int found_vga; unsigned long io_start, io_end; unsigned long mem_start, mem_end; + unsigned long prefetch_start, prefetch_end; }; struct pci_device_id { @@ -582,8 +582,7 @@ int pci_enable_wake(struct pci_dev *dev, u32 state, int enable); int pci_claim_resource(struct pci_dev *, int); void pci_assign_unassigned_resources(void); void pdev_enable_device(struct pci_dev *); -void pdev_sort_resources(struct pci_dev *, struct resource_list *, u32); -unsigned long pci_bridge_check_io(struct pci_dev *); +void pdev_sort_resources(struct pci_dev *, struct resource_list *); void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(struct pci_dev *, u8, u8)); #define HAVE_PCI_REQ_REGIONS |