diff options
author | Jason Liu <jason.hui.liu@nxp.com> | 2022-03-21 13:03:10 -0500 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2022-03-21 13:03:10 -0500 |
commit | ecc7b3ab5a9c6aea1c46dfc5bfcd47498cd13afd (patch) | |
tree | 3ba60f7554ff5165b3367346948027be8b9ed64d /arch/arm64/include/asm/insn.h | |
parent | f74fe3b339a96b16c18ed7dba37d7ceedeb462fb (diff) | |
parent | 0464ab17184b8fdec6676fabe76059b90e54e74f (diff) |
Merge tag 'v5.15.30' into lf-5.15.y
This is the 5.15.30 stable release
* tag 'v5.15.30': (197 commits)
Linux 5.15.30
ice: Fix race condition during interface enslave
x86/module: Fix the paravirt vs alternative order
...
Signed-off-by: Jason Liu <jason.hui.liu@nxp.com>
Diffstat (limited to 'arch/arm64/include/asm/insn.h')
-rw-r--r-- | arch/arm64/include/asm/insn.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h index 6b776c8667b2..b02f0c328c8e 100644 --- a/arch/arm64/include/asm/insn.h +++ b/arch/arm64/include/asm/insn.h @@ -65,6 +65,7 @@ enum aarch64_insn_hint_cr_op { AARCH64_INSN_HINT_PSB = 0x11 << 5, AARCH64_INSN_HINT_TSB = 0x12 << 5, AARCH64_INSN_HINT_CSDB = 0x14 << 5, + AARCH64_INSN_HINT_CLEARBHB = 0x16 << 5, AARCH64_INSN_HINT_BTI = 0x20 << 5, AARCH64_INSN_HINT_BTIC = 0x22 << 5, |