diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-15 15:38:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-15 15:38:12 -0800 |
| commit | 42a19aa1707cce382bc5e534e2e36024c3611674 (patch) | |
| tree | 863b7c9a5abdcc47ad425b5438ed306a7904e268 /arch/arc/net/bpf_jit_arcv2.c | |
| parent | 7031a38ab74cfe997d2a767d18e3af7445547d07 (diff) | |
| parent | 824927e88456331c7a999fdf5d9d27923b619590 (diff) | |
Merge tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Sundry build and misc fixes
* tag 'arc-6.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: build: Try to guess GCC variant of cross compiler
ARC: bpf: Correct conditional check in 'check_jmp_32'
ARC: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices
ARC: build: Use __force to suppress per-CPU cmpxchg warnings
ARC: fix reference of dependency for PAE40 config
ARC: build: disallow invalid PAE40 + 4K page config
arc: rename aux.h to arc_aux.h
Diffstat (limited to 'arch/arc/net/bpf_jit_arcv2.c')
| -rw-r--r-- | arch/arc/net/bpf_jit_arcv2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/net/bpf_jit_arcv2.c b/arch/arc/net/bpf_jit_arcv2.c index 4458e409ca0a..6d989b6d88c6 100644 --- a/arch/arc/net/bpf_jit_arcv2.c +++ b/arch/arc/net/bpf_jit_arcv2.c @@ -2916,7 +2916,7 @@ bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond) addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal; disp = get_displacement(curr_off + addendum, targ_off); - if (ARC_CC_AL) + if (cond == ARC_CC_AL) return is_valid_far_disp(disp); else return is_valid_near_disp(disp); |