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

[karo-tx-linux.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index c11c8238797c30574c9f77f88c561af049a26ab9..d64feb3ea0be48600d71ca97f3bbd3c561181ed8 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -66,8 +66,8 @@
 #include <asm/firmware.h>
 #include <asm/eeh.h>
 #include <asm/reg.h>
+#include <asm/plpar_wrappers.h>
 
-#include "plpar_wrappers.h"
 #include "pseries.h"
 
 int CMO_PrPSP = -1;
@@ -183,7 +183,7 @@ static void __init pseries_mpic_init_IRQ(void)
        np = of_find_node_by_path("/");
        naddr = of_n_addr_cells(np);
        opprop = of_get_property(np, "platform-open-pic", &opplen);
-       if (opprop != 0) {
+       if (opprop != NULL) {
                openpic_addr = of_read_number(opprop, naddr);
                printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
        }
@@ -323,7 +323,7 @@ static int alloc_dispatch_logs(void)
        get_paca()->lppaca_ptr->dtl_idx = 0;
 
        /* hypervisor reads buffer length from this field */
-       dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
+       dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
        ret = register_dtl(hard_smp_processor_id(), __pa(dtl));
        if (ret)
                pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "