[IA64] Convert ia64 to use int-ll64.h

It is generally agreed that it would be beneficial for u64 to be an
unsigned long long on all architectures.  ia64 (in common with several
other 64-bit architectures) currently uses unsigned long.  Migrating
piecemeal is too painful; this giant patch fixes all compilation warnings
and errors that come as a result of switching to use int-ll64.h.

Note that userspace will still see __u64 defined as unsigned long.  This
is important as it affects C++ name mangling.

[Updated by Tony Luck to change efi.h:efi_freemem_callback_t to use
 u64 for start/end rather than unsigned long]

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

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)
 {
         struct resource *resource;
         char *name;
-        u64 base, min, max, base_port;
+        unsigned long base, min, max, base_port;
         unsigned int sparse = 0, space_nr, len;
 
         resource = kzalloc(sizeof(*resource), GFP_KERNEL);
@@ -292,7 +292,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         window->offset = offset;
 
         if (insert_resource(root, &window->resource)) {
-                printk(KERN_ERR "alloc 0x%lx-0x%lx from %s for %s failed\n",
+                printk(KERN_ERR "alloc 0x%llx-0x%llx from %s for %s failed\n",
                         window->resource.start, window->resource.end,
                         root->name, info->name);
         }
@@ -314,8 +314,8 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
                     (res->end - res->start < 16))
                         continue;
                 if (j >= PCI_BUS_NUM_RESOURCES) {
-                        printk("Ignoring range [%lx-%lx] (%lx)\n", res->start,
-                                        res->end, res->flags);
+                        printk("Ignoring range [%#llx-%#llx] (%lx)\n",
+                                        res->start, res->end, res->flags);
                         continue;
                 }
                 bus->resource[j++] = res;
@@ -728,8 +728,8 @@ extern u8 pci_cache_line_size;
  */
 static void __init set_pci_cacheline_size(void)
 {
-        u64 levels, unique_caches;
-        s64 status;
+        unsigned long levels, unique_caches;
+        long status;
         pal_cache_config_info_t cci;
 
         status = ia64_pal_cache_summary(&levels, &unique_caches);