diff options
Diffstat (limited to 'arch/ia64/sn/kernel/io_acpi_init.c')
-rw-r--r-- | arch/ia64/sn/kernel/io_acpi_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c index 6568942a95f0..bc610a6c7851 100644 --- a/arch/ia64/sn/kernel/io_acpi_init.c +++ b/arch/ia64/sn/kernel/io_acpi_init.c | |||
@@ -232,7 +232,7 @@ exit: | |||
232 | static unsigned int | 232 | static unsigned int |
233 | get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) | 233 | get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) |
234 | { | 234 | { |
235 | unsigned long adr; | 235 | unsigned long long adr; |
236 | acpi_handle child; | 236 | acpi_handle child; |
237 | unsigned int devfn; | 237 | unsigned int devfn; |
238 | int function; | 238 | int function; |
@@ -292,8 +292,8 @@ get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle) | |||
292 | static acpi_status | 292 | static acpi_status |
293 | find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv) | 293 | find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv) |
294 | { | 294 | { |
295 | unsigned long bbn = -1; | 295 | unsigned long long bbn = -1; |
296 | unsigned long adr; | 296 | unsigned long long adr; |
297 | acpi_handle parent = NULL; | 297 | acpi_handle parent = NULL; |
298 | acpi_status status; | 298 | acpi_status status; |
299 | unsigned int devfn; | 299 | unsigned int devfn; |
@@ -348,7 +348,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, | |||
348 | unsigned int host_devfn; | 348 | unsigned int host_devfn; |
349 | struct sn_pcidev_match pcidev_match; | 349 | struct sn_pcidev_match pcidev_match; |
350 | acpi_handle rootbus_handle; | 350 | acpi_handle rootbus_handle; |
351 | unsigned long segment; | 351 | unsigned long long segment; |
352 | acpi_status status; | 352 | acpi_status status; |
353 | 353 | ||
354 | rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle; | 354 | rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle; |
@@ -357,7 +357,7 @@ sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info, | |||
357 | if (ACPI_SUCCESS(status)) { | 357 | if (ACPI_SUCCESS(status)) { |
358 | if (segment != pci_domain_nr(dev)) { | 358 | if (segment != pci_domain_nr(dev)) { |
359 | printk(KERN_ERR | 359 | printk(KERN_ERR |
360 | "%s: Segment number mismatch, 0x%lx vs 0x%x for: ", | 360 | "%s: Segment number mismatch, 0x%llx vs 0x%x for: ", |
361 | __func__, segment, pci_domain_nr(dev)); | 361 | __func__, segment, pci_domain_nr(dev)); |
362 | acpi_ns_print_node_pathname(rootbus_handle, NULL); | 362 | acpi_ns_print_node_pathname(rootbus_handle, NULL); |
363 | printk("\n"); | 363 | printk("\n"); |