Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / arch / sparc / kernel / mdesc.c

diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index dde52bcf5c64e11daa1cd22558238ebd45eb46b9..3f79f0c23a084d4a80ae572be79db9e0f747d66c 100644 (file)
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -11,6 +11,7 @@
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
 
+#include <asm/cpudata.h>
 #include <asm/hypervisor.h>
 #include <asm/mdesc.h>
 #include <asm/prom.h>
@@ -535,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
        {