Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / arch / powerpc / kernel / epapr_paravirt.c

diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index 7898be90f2dcd013ecec5d17dcb4897e9a1b62f7..60d1a2259dbed01e15b58340c62119b4fb56b085 100644 (file)
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -36,7 +36,7 @@ static int __init early_init_dt_scan_epapr(unsigned long node,
                                           int depth, void *data)
 {
        const u32 *insts;
-       unsigned long len;
+       int len;
        int i;
 
        insts = of_get_flat_dt_prop(node, "hcall-instructions", &len);
@@ -47,9 +47,10 @@ static int __init early_init_dt_scan_epapr(unsigned long node,
                return -1;
 
        for (i = 0; i < (len / 4); i++) {
-               patch_instruction(epapr_hypercall_start + i, insts[i]);
+               u32 inst = be32_to_cpu(insts[i]);
+               patch_instruction(epapr_hypercall_start + i, inst);
 #if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
-               patch_instruction(epapr_ev_idle_start + i, insts[i]);
+               patch_instruction(epapr_ev_idle_start + i, inst);
 #endif
        }