diff options
| author | Will Deacon <will@kernel.org> | 2020-05-05 16:19:09 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-05-05 16:19:09 +0200 |
| commit | e5159827e057487359fc76f496a16ddbb8536cc9 (patch) | |
| tree | 55c32fb0e1b0ca5ac3cf152c0a2a614321265298 /arch/arm64/kernel/probes | |
| parent | Merge branch 'for-next/bti-user' into for-next/bti (diff) | |
| parent | arm64: Disable old style assembly annotations (diff) | |
| parent | arm64: insn: Report PAC and BTI instructions as skippable (diff) | |
| download | linux-e5159827e057487359fc76f496a16ddbb8536cc9.tar.xz linux-e5159827e057487359fc76f496a16ddbb8536cc9.zip | |
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