xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: BPF: Avoid unreachable code on little endian

Browse Source 
On little endian, avoid generating the big endian version of the code
by using #else in addition to #ifdef #endif. Also fix one alignment
issue wrt delay slot.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: stable@vger.kernel.org # v4.2+
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/11097/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Aurelien Jarno
2015-09-05 18:46:56 +02:00
committed by Ralf Baechle
parent 88d3426942
commit faa9724a67
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/mips/net/bpf_jit_asm.S
View File

@@ -151,9 +151,10 @@ NESTED(bpf_slow_path_word, (6 * SZREG), $r_sp)
wsbh t0, $r_s0 wsbh t0, $r_s0
jr $r_ra jr $r_ra
rotr $r_A, t0, 16 rotr $r_A, t0, 16
#endif #else
jr $r_ra jr $r_ra
move $r_A, $r_s0 move $r_A, $r_s0
#endif
END(bpf_slow_path_word) END(bpf_slow_path_word)
@@ -162,9 +163,10 @@ NESTED(bpf_slow_path_half, (6 * SZREG), $r_sp)
#ifdef CONFIG_CPU_LITTLE_ENDIAN #ifdef CONFIG_CPU_LITTLE_ENDIAN
jr $r_ra jr $r_ra
wsbh $r_A, $r_s0 wsbh $r_A, $r_s0
#endif #else
jr $r_ra jr $r_ra
move $r_A, $r_s0 move $r_A, $r_s0
#endif
END(bpf_slow_path_half) END(bpf_slow_path_half)