diff options
author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 16:12:31 +0100 |
---|---|---|
committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-04-01 16:12:31 +0100 |
commit | de4fb176622d54a82ea3ceb7362392aaf5ff0b5a (patch) | |
tree | 8b510763d14d89b97cd719e79834c84e095932d7 /arch/mips/net/bpf_jit_comp.h | |
parent | 9be4c88bb7924f68f88cfd47d925c2d046f51a73 (diff) | |
parent | 9c6d6652e950fb34295f446676a811f6df5b8561 (diff) |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/mips/net/bpf_jit_comp.h')
-rw-r--r-- | arch/mips/net/bpf_jit_comp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/net/bpf_jit_comp.h b/arch/mips/net/bpf_jit_comp.h index 6f3a7b07294b..a37fe20818eb 100644 --- a/arch/mips/net/bpf_jit_comp.h +++ b/arch/mips/net/bpf_jit_comp.h @@ -98,7 +98,7 @@ do { \ #define emit(...) __emit(__VA_ARGS__) /* Workaround for R10000 ll/sc errata */ -#ifdef CONFIG_WAR_R10000 +#ifdef CONFIG_WAR_R10000_LLSC #define LLSC_beqz beqzl #else #define LLSC_beqz beqz |