[PATCH] 64bit resource: change pci core and arch code to use resource_size_t
Based on a patch series originally from Vivek Goyal <vgoyal@in.ibm.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -80,8 +80,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
|
||||
} else {
|
||||
if (res->flags & IORESOURCE_ROM_COPY) {
|
||||
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
|
||||
return (void __iomem *)pci_resource_start(pdev,
|
||||
PCI_ROM_RESOURCE);
|
||||
return (void __iomem *)(unsigned long)
|
||||
pci_resource_start(pdev, PCI_ROM_RESOURCE);
|
||||
} else {
|
||||
/* assign the ROM an address if it doesn't have one */
|
||||
if (res->parent == NULL &&
|
||||
@@ -170,11 +170,11 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)
|
||||
return rom;
|
||||
|
||||
res->end = res->start + *size;
|
||||
memcpy_fromio((void*)res->start, rom, *size);
|
||||
memcpy_fromio((void*)(unsigned long)res->start, rom, *size);
|
||||
pci_unmap_rom(pdev, rom);
|
||||
res->flags |= IORESOURCE_ROM_COPY;
|
||||
|
||||
return (void __iomem *)res->start;
|
||||
return (void __iomem *)(unsigned long)res->start;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -227,7 +227,7 @@ void pci_cleanup_rom(struct pci_dev *pdev)
|
||||
{
|
||||
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
|
||||
if (res->flags & IORESOURCE_ROM_COPY) {
|
||||
kfree((void*)res->start);
|
||||
kfree((void*)(unsigned long)res->start);
|
||||
res->flags &= ~IORESOURCE_ROM_COPY;
|
||||
res->start = 0;
|
||||
res->end = 0;
|
||||
|
Reference in New Issue
Block a user