From: Sasha Levin Date: Mon, 11 Oct 2021 18:38:23 +0000 (-0400) Subject: Fix up backport of powerpc-bpf-fix-bpf_mod-when-imm-1.patch X-Git-Tag: v5.14.12~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76c8bc67c8242e9dccda11469965e08f6e84ad73;p=thirdparty%2Fkernel%2Fstable-queue.git Fix up backport of powerpc-bpf-fix-bpf_mod-when-imm-1.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch index deb434e531f..420ca4b3cce 100644 --- a/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ b/queue-4.14/powerpc-bpf-fix-bpf_mod-when-imm-1.patch @@ -36,7 +36,7 @@ index 28434040cfb6..75d495491364 100644 + if (BPF_OP(code) == BPF_DIV) { + goto bpf_alu32_trunc; + } else { -+ EMIT(PPC_RAW_LI(dst_reg, 0)); ++ EMIT(PPC_LI(dst_reg, 0)); + break; + } + } diff --git a/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch index 4db3b61060a..f65bbe45581 100644 --- a/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ b/queue-4.19/powerpc-bpf-fix-bpf_mod-when-imm-1.patch @@ -36,7 +36,7 @@ index e7d56ddba43a..ff201b1fe768 100644 + if (BPF_OP(code) == BPF_DIV) { + goto bpf_alu32_trunc; + } else { -+ EMIT(PPC_RAW_LI(dst_reg, 0)); ++ EMIT(PPC_LI(dst_reg, 0)); + break; + } + } diff --git a/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch index d0e86558808..ab9ca2ced29 100644 --- a/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ b/queue-4.9/powerpc-bpf-fix-bpf_mod-when-imm-1.patch @@ -36,7 +36,7 @@ index 888ee95340da..2152ffe4e5ea 100644 + if (BPF_OP(code) == BPF_DIV) { + goto bpf_alu32_trunc; + } else { -+ EMIT(PPC_RAW_LI(dst_reg, 0)); ++ EMIT(PPC_LI(dst_reg, 0)); + break; + } + } diff --git a/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch index cbf92d8969a..c032c7be9e1 100644 --- a/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ b/queue-5.10/powerpc-bpf-fix-bpf_mod-when-imm-1.patch @@ -36,7 +36,7 @@ index 658ca2bab13c..e79f9eae2bc0 100644 + if (BPF_OP(code) == BPF_DIV) { + goto bpf_alu32_trunc; + } else { -+ EMIT(PPC_RAW_LI(dst_reg, 0)); ++ EMIT(PPC_LI(dst_reg, 0)); + break; + } + } diff --git a/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch b/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch index 251eb790255..5da733b3193 100644 --- a/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch +++ b/queue-5.4/powerpc-bpf-fix-bpf_mod-when-imm-1.patch @@ -36,7 +36,7 @@ index 20bfd753bcba..a05386318f70 100644 + if (BPF_OP(code) == BPF_DIV) { + goto bpf_alu32_trunc; + } else { -+ EMIT(PPC_RAW_LI(dst_reg, 0)); ++ EMIT(PPC_LI(dst_reg, 0)); + break; + } + }