Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes

[karo-tx-linux.git] / arch / powerpc / boot / ofconsole.c

diff --git a/arch/powerpc/boot/ofconsole.c b/arch/powerpc/boot/ofconsole.c
index ce0e0242445325feb7251ae9214705e90c42864a..8b754702460aee3e51eabd016d71c888abd4a719 100644 (file)
--- a/arch/powerpc/boot/ofconsole.c
+++ b/arch/powerpc/boot/ofconsole.c
@@ -18,7 +18,7 @@
 
 #include "of.h"
 
-static void *of_stdout_handle;
+static unsigned int of_stdout_handle;
 
 static int of_console_open(void)
 {
@@ -27,8 +27,10 @@ static int of_console_open(void)
        if (((devp = of_finddevice("/chosen")) != NULL)
            && (of_getprop(devp, "stdout", &of_stdout_handle,
                           sizeof(of_stdout_handle))
-               == sizeof(of_stdout_handle)))
+               == sizeof(of_stdout_handle))) {
+               of_stdout_handle = be32_to_cpu(of_stdout_handle);
                return 0;
+       }
 
        return -1;
 }