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

[sfrench/cifs-2.6.git] / arch / ia64 / sn / kernel / sn2 / sn_hwperf.c

diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 9e6491cf72bd4f1d1246b826e4fa878b4fce7394..4c7e747909583b5de652d5b3b73507a3ed6a644c 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -414,7 +414,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
                }
                seq_printf(s, "partition %u %s local "
                        "shubtype %s, "
-                       "nasid_mask 0x%016lx, "
+                       "nasid_mask 0x%016llx, "
                        "nasid_bits %d:%d, "
                        "system_size %d, "
                        "sharing_size %d, "
@@ -683,7 +683,7 @@ static int sn_hwperf_map_err(int hwperf_err)
  * ioctl for "sn_hwperf" misc device
  */
 static int
-sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
+sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
 {
        struct sn_hwperf_ioctl_args a;
        struct cpuinfo_ia64 *cdata;