diff options
Diffstat (limited to 'arch/ppc/kernel/pci.c')
-rw-r--r-- | arch/ppc/kernel/pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 8544e100d713..242bb052be67 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c | |||
@@ -171,13 +171,13 @@ EXPORT_SYMBOL(pcibios_bus_to_resource); | |||
171 | * but we want to try to avoid allocating at 0x2900-0x2bff | 171 | * but we want to try to avoid allocating at 0x2900-0x2bff |
172 | * which might have be mirrored at 0x0100-0x03ff.. | 172 | * which might have be mirrored at 0x0100-0x03ff.. |
173 | */ | 173 | */ |
174 | void pcibios_align_resource(void *data, struct resource *res, unsigned long size, | 174 | void pcibios_align_resource(void *data, struct resource *res, |
175 | unsigned long align) | 175 | resource_size_t size, resource_size_t align) |
176 | { | 176 | { |
177 | struct pci_dev *dev = data; | 177 | struct pci_dev *dev = data; |
178 | 178 | ||
179 | if (res->flags & IORESOURCE_IO) { | 179 | if (res->flags & IORESOURCE_IO) { |
180 | unsigned long start = res->start; | 180 | resource_size_t start = res->start; |
181 | 181 | ||
182 | if (size > 0x100) { | 182 | if (size > 0x100) { |
183 | printk(KERN_ERR "PCI: I/O Region %s/%d too large" | 183 | printk(KERN_ERR "PCI: I/O Region %s/%d too large" |
@@ -960,8 +960,8 @@ static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp, | |||
960 | else | 960 | else |
961 | prot |= _PAGE_GUARDED; | 961 | prot |= _PAGE_GUARDED; |
962 | 962 | ||
963 | printk("PCI map for %s:%llx, prot: %llx\n", pci_name(dev), rp->start, | 963 | printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev), |
964 | prot); | 964 | (unsigned long long)rp->start, prot); |
965 | 965 | ||
966 | return __pgprot(prot); | 966 | return __pgprot(prot); |
967 | } | 967 | } |
@@ -1130,7 +1130,7 @@ long sys_pciconfig_iobase(long which, unsigned long bus, unsigned long devfn) | |||
1130 | 1130 | ||
1131 | void pci_resource_to_user(const struct pci_dev *dev, int bar, | 1131 | void pci_resource_to_user(const struct pci_dev *dev, int bar, |
1132 | const struct resource *rsrc, | 1132 | const struct resource *rsrc, |
1133 | u64 *start, u64 *end) | 1133 | resource_size_t *start, resource_size_t *end) |
1134 | { | 1134 | { |
1135 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); | 1135 | struct pci_controller *hose = pci_bus_to_hose(dev->bus->number); |
1136 | unsigned long offset = 0; | 1136 | unsigned long offset = 0; |