Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[cascardo/linux.git] / arch / powerpc / net / bpf_jit_comp.c

diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 2d66a84..7e706f3 100644 (file)
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -16,7 +16,7 @@
 #include <linux/filter.h>
 #include <linux/if_vlan.h>
 
-#include "bpf_jit.h"
+#include "bpf_jit32.h"
 
 int bpf_jit_enable __read_mostly;
 
@@ -161,14 +161,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                        break;
                case BPF_ALU | BPF_MUL | BPF_X: /* A *= X; */
                        ctx->seen |= SEEN_XREG;
-                       PPC_MUL(r_A, r_A, r_X);
+                       PPC_MULW(r_A, r_A, r_X);
                        break;
                case BPF_ALU | BPF_MUL | BPF_K: /* A *= K */
                        if (K < 32768)
                                PPC_MULI(r_A, r_A, K);
                        else {
                                PPC_LI32(r_scratch1, K);
-                               PPC_MUL(r_A, r_A, r_scratch1);
+                               PPC_MULW(r_A, r_A, r_scratch1);
                        }
                        break;
                case BPF_ALU | BPF_MOD | BPF_X: /* A %= X; */
@@ -184,7 +184,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                        }
                        if (code == (BPF_ALU | BPF_MOD | BPF_X)) {
                                PPC_DIVWU(r_scratch1, r_A, r_X);
-                               PPC_MUL(r_scratch1, r_X, r_scratch1);
+                               PPC_MULW(r_scratch1, r_X, r_scratch1);
                                PPC_SUB(r_A, r_A, r_scratch1);
                        } else {
                                PPC_DIVWU(r_A, r_A, r_X);
@@ -193,7 +193,7 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
                case BPF_ALU | BPF_MOD | BPF_K: /* A %= K; */
                        PPC_LI32(r_scratch2, K);
                        PPC_DIVWU(r_scratch1, r_A, r_scratch2);
-                       PPC_MUL(r_scratch1, r_scratch2, r_scratch1);
+                       PPC_MULW(r_scratch1, r_scratch2, r_scratch1);
                        PPC_SUB(r_A, r_A, r_scratch1);
                        break;
                case BPF_ALU | BPF_DIV | BPF_K: /* A /= K */