summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2020-05-05 17:19:09 +0300
committerWill Deacon <will@kernel.org>2020-05-05 17:19:09 +0300
commite5159827e057487359fc76f496a16ddbb8536cc9 (patch)
tree55c32fb0e1b0ca5ac3cf152c0a2a614321265298
parent80e4e561321595d2e5f4a173e8cf8d8432078995 (diff)
parent50479d58eaa321f916fd916615710c634b8aafaf (diff)
parent47d67e4d19184ec9f8091c98ad4df0411baa8719 (diff)
downloadlinux-e5159827e057487359fc76f496a16ddbb8536cc9.tar.xz
Merge branches 'for-next/asm' and 'for-next/insn' into for-next/bti
Merge in dependencies for in-kernel Branch Target Identification support. * for-next/asm: arm64: Disable old style assembly annotations arm64: kernel: Convert to modern annotations for assembly functions arm64: entry: Refactor and modernise annotation for ret_to_user x86/asm: Provide a Kconfig symbol for disabling old assembly annotations x86/32: Remove CONFIG_DOUBLEFAULT * for-next/insn: arm64: insn: Report PAC and BTI instructions as skippable arm64: insn: Don't assume unrecognized HINTs are skippable arm64: insn: Provide a better name for aarch64_insn_is_nop() arm64: insn: Add constants for new HINT instruction decode