git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
i386
/
pci
/
i386.c
diff --git
a/arch/i386/pci/i386.c
b/arch/i386/pci/i386.c
index
8277aba
..
ed2c8c8
100644
(file)
--- a/
arch/i386/pci/i386.c
+++ b/
arch/i386/pci/i386.c
@@
-48,10
+48,10
@@
*/
void
pcibios_align_resource(void *data, struct resource *res,
*/
void
pcibios_align_resource(void *data, struct resource *res,
-
resource_size_t size, resource_size_t
align)
+
unsigned long size, unsigned long
align)
{
if (res->flags & IORESOURCE_IO) {
{
if (res->flags & IORESOURCE_IO) {
-
resource_size_t
start = res->start;
+
unsigned long
start = res->start;
if (start & 0x300) {
start = (start + 0x3ff) & ~0x3ff;
if (start & 0x300) {
start = (start + 0x3ff) & ~0x3ff;
@@
-110,7
+110,7
@@
static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
continue;
pr = pci_find_parent_resource(dev, r);
if (!r->start || !pr || request_resource(pr, r) < 0) {
continue;
pr = pci_find_parent_resource(dev, r);
if (!r->start || !pr || request_resource(pr, r) < 0) {
- printk(KERN_
DEBUG
"PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
+ printk(KERN_
ERR
"PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
/* Something is wrong with the region.
Invalidate the resource to prevent child
resource allocations in this range. */
/* Something is wrong with the region.
Invalidate the resource to prevent child
resource allocations in this range. */
@@
-242,15
+242,6
@@
int pcibios_enable_resources(struct pci_dev *dev, int mask)
return 0;
}
return 0;
}
-void pcibios_disable_resources(struct pci_dev *dev)
-{
- u16 cmd;
-
- pci_read_config_word(dev, PCI_COMMAND, &cmd);
- cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
- pci_write_config_word(dev, PCI_COMMAND, cmd);
-}
-
/*
* If we set up a device for bus mastering, we need to check the latency
* timer as certain crappy BIOSes forget to set it properly.
/*
* If we set up a device for bus mastering, we need to check the latency
* timer as certain crappy BIOSes forget to set it properly.
@@
-285,6
+276,8
@@
int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
/* Leave vm_pgoff as-is, the PCI space address is the physical
* address on this platform.
*/
/* Leave vm_pgoff as-is, the PCI space address is the physical
* address on this platform.
*/
+ vma->vm_flags |= (VM_SHM | VM_LOCKED | VM_IO);
+
prot = pgprot_val(vma->vm_page_prot);
if (boot_cpu_data.x86 > 3)
prot |= _PAGE_PCD | _PAGE_PWT;
prot = pgprot_val(vma->vm_page_prot);
if (boot_cpu_data.x86 > 3)
prot |= _PAGE_PCD | _PAGE_PWT;