[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, 9 insertions, 5 deletions

diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index da3b0cf495a3..1481b0a28ca0 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -171,7 +171,8 @@ apply_imm60 (struct module *mod, struct insn *insn, uint64_t val)
                 return 0;
         }
         if (val + ((uint64_t) 1 << 59) >= (1UL << 60)) {
-                printk(KERN_ERR "%s: value %ld out of IMM60 range\n", mod->name, (int64_t) val);
+                printk(KERN_ERR "%s: value %ld out of IMM60 range\n",
+                        mod->name, (long) val);
                 return 0;
         }
         ia64_patch_imm60((u64) insn, val);
@@ -182,7 +183,8 @@ static int
 apply_imm22 (struct module *mod, struct insn *insn, uint64_t val)
 {
         if (val + (1 << 21) >= (1 << 22)) {
-                printk(KERN_ERR "%s: value %li out of IMM22 range\n", mod->name, (int64_t)val);
+                printk(KERN_ERR "%s: value %li out of IMM22 range\n",
+                        mod->name, (long)val);
                 return 0;
         }
         ia64_patch((u64) insn, 0x01fffcfe000UL, (  ((val & 0x200000UL) << 15) /* bit 21 -> 36 */
@@ -196,7 +198,8 @@ static int
 apply_imm21b (struct module *mod, struct insn *insn, uint64_t val)
 {
         if (val + (1 << 20) >= (1 << 21)) {
-                printk(KERN_ERR "%s: value %li out of IMM21b range\n", mod->name, (int64_t)val);
+                printk(KERN_ERR "%s: value %li out of IMM21b range\n",
+                        mod->name, (long)val);
                 return 0;
         }
         ia64_patch((u64) insn, 0x11ffffe000UL, (  ((val & 0x100000UL) << 16) /* bit 20 -> 36 */
@@ -701,8 +704,9 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
               case RV_PCREL2:
                 if (r_type == R_IA64_PCREL21BI) {
                         if (!is_internal(mod, val)) {
-                                printk(KERN_ERR "%s: %s reloc against non-local symbol (%lx)\n",
-                                       __func__, reloc_name[r_type], val);
+                                printk(KERN_ERR "%s: %s reloc against "
+                                        "non-local symbol (%lx)\n", __func__,
+                                        reloc_name[r_type], (unsigned long)val);
                                 return -ENOEXEC;
                         }
                         format = RF_INSN21B;