diff options
Diffstat (limited to 'arch/ia64/pci/pci.c')
-rw-r--r-- | arch/ia64/pci/pci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 61f1af5c23c1..e643373e4701 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -163,7 +163,7 @@ add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr) | |||
163 | { | 163 | { |
164 | struct resource *resource; | 164 | struct resource *resource; |
165 | char *name; | 165 | char *name; |
166 | u64 base, min, max, base_port; | 166 | unsigned long base, min, max, base_port; |
167 | unsigned int sparse = 0, space_nr, len; | 167 | unsigned int sparse = 0, space_nr, len; |
168 | 168 | ||
169 | resource = kzalloc(sizeof(*resource), GFP_KERNEL); | 169 | resource = kzalloc(sizeof(*resource), GFP_KERNEL); |
@@ -292,7 +292,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | |||
292 | window->offset = offset; | 292 | window->offset = offset; |
293 | 293 | ||
294 | if (insert_resource(root, &window->resource)) { | 294 | if (insert_resource(root, &window->resource)) { |
295 | printk(KERN_ERR "alloc 0x%lx-0x%lx from %s for %s failed\n", | 295 | printk(KERN_ERR "alloc 0x%llx-0x%llx from %s for %s failed\n", |
296 | window->resource.start, window->resource.end, | 296 | window->resource.start, window->resource.end, |
297 | root->name, info->name); | 297 | root->name, info->name); |
298 | } | 298 | } |
@@ -314,8 +314,8 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) | |||
314 | (res->end - res->start < 16)) | 314 | (res->end - res->start < 16)) |
315 | continue; | 315 | continue; |
316 | if (j >= PCI_BUS_NUM_RESOURCES) { | 316 | if (j >= PCI_BUS_NUM_RESOURCES) { |
317 | printk("Ignoring range [%lx-%lx] (%lx)\n", res->start, | 317 | printk("Ignoring range [%#llx-%#llx] (%lx)\n", |
318 | res->end, res->flags); | 318 | res->start, res->end, res->flags); |
319 | continue; | 319 | continue; |
320 | } | 320 | } |
321 | bus->resource[j++] = res; | 321 | bus->resource[j++] = res; |
@@ -728,8 +728,8 @@ extern u8 pci_cache_line_size; | |||
728 | */ | 728 | */ |
729 | static void __init set_pci_cacheline_size(void) | 729 | static void __init set_pci_cacheline_size(void) |
730 | { | 730 | { |
731 | u64 levels, unique_caches; | 731 | unsigned long levels, unique_caches; |
732 | s64 status; | 732 | long status; |
733 | pal_cache_config_info_t cci; | 733 | pal_cache_config_info_t cci; |
734 | 734 | ||
735 | status = ia64_pal_cache_summary(&levels, &unique_caches); | 735 | status = ia64_pal_cache_summary(&levels, &unique_caches); |