Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Work around branch tracer warning.
  sparc64: Fix unsigned long long warnings in drivers.
  sparc64: Use unsigned long long for u64.
  sparc: refactor code in fault_32.c
  sparc64: refactor code in init_64.c
  sparc64: refactor code in viohs.c
  sparc: make proces_ver_nack a bit more readable

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 3c539a6d7c1..3f79f0c23a0 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -536,24 +536,24 @@ static void __init report_platform_properties(void)
 
         v = mdesc_get_property(hp, pn, "hostid", NULL);
         if (v)
-                printk("PLATFORM: hostid [%08lx]\n", *v);
+                printk("PLATFORM: hostid [%08llx]\n", *v);
         v = mdesc_get_property(hp, pn, "serial#", NULL);
         if (v)
-                printk("PLATFORM: serial# [%08lx]\n", *v);
+                printk("PLATFORM: serial# [%08llx]\n", *v);
         v = mdesc_get_property(hp, pn, "stick-frequency", NULL);
-        printk("PLATFORM: stick-frequency [%08lx]\n", *v);
+        printk("PLATFORM: stick-frequency [%08llx]\n", *v);
         v = mdesc_get_property(hp, pn, "mac-address", NULL);
         if (v)
-                printk("PLATFORM: mac-address [%lx]\n", *v);
+                printk("PLATFORM: mac-address [%llx]\n", *v);
         v = mdesc_get_property(hp, pn, "watchdog-resolution", NULL);
         if (v)
-                printk("PLATFORM: watchdog-resolution [%lu ms]\n", *v);
+                printk("PLATFORM: watchdog-resolution [%llu ms]\n", *v);
         v = mdesc_get_property(hp, pn, "watchdog-max-timeout", NULL);
         if (v)
-                printk("PLATFORM: watchdog-max-timeout [%lu ms]\n", *v);
+                printk("PLATFORM: watchdog-max-timeout [%llu ms]\n", *v);
         v = mdesc_get_property(hp, pn, "max-cpus", NULL);
         if (v)
-                printk("PLATFORM: max-cpus [%lu]\n", *v);
+                printk("PLATFORM: max-cpus [%llu]\n", *v);
 
 #ifdef CONFIG_SMP
         {