summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2020-06-02159-976/+2559
|\
| * Merge branch 'for-next/scs' into for-next/coreWill Deacon2020-05-2831-9/+406
| |\
| | * arm64: entry-ftrace.S: Update comment to indicate that x18 is liveWill Deacon2020-05-181-2/+3
| | * scs: Move DEFINE_SCS macro into core codeWill Deacon2020-05-182-4/+4
| | * scs: Remove references to asm/scs.h from core codeWill Deacon2020-05-182-3/+2
| | * scs: Move scs_overflow_check() out of architecture codeWill Deacon2020-05-186-24/+8
| | * arm64: scs: Use 'scs_sp' register alias for x18Will Deacon2020-05-183-8/+10
| | * scs: Move accounting into alloc/free functionsWill Deacon2020-05-181-24/+21
| | * arm64: scs: Store absolute SCS stack pointer value in thread_infoWill Deacon2020-05-185-14/+12
| | * efi/libstub: Disable Shadow Call StackSami Tolvanen2020-05-151-0/+3
| | * arm64: scs: Add shadow stacks for SDEISami Tolvanen2020-05-152-1/+18
| | * arm64: Implement Shadow Call StackSami Tolvanen2020-05-159-2/+114
| | * arm64: Disable SCS for hypervisor codeSami Tolvanen2020-05-151-1/+1
| | * arm64: vdso: Disable Shadow Call StackSami Tolvanen2020-05-151-1/+1
| | * arm64: efi: Restore register x18 if it was corruptedSami Tolvanen2020-05-151-1/+10
| | * arm64: Preserve register x18 when CPU is suspendedSami Tolvanen2020-05-152-1/+15
| | * arm64: Reserve register x18 from general allocation with SCSSami Tolvanen2020-05-151-0/+4
| | * scs: Disable when function graph tracing is enabledSami Tolvanen2020-05-151-0/+1
| | * scs: Add support for stack usage debuggingSami Tolvanen2020-05-151-1/+29
| | * scs: Add page accounting for shadow call stack allocationsSami Tolvanen2020-05-156-0/+37
| | * scs: Add support for Clang's Shadow Call Stack (SCS)Sami Tolvanen2020-05-1510-0/+191
| * | Merge branch 'for-next/kvm/errata' into for-next/coreWill Deacon2020-05-289-77/+68
| |\ \
| | * | KVM: arm64: Move __load_guest_stage2 to kvm_mmu.hMarc Zyngier2020-05-282-18/+17
| | * | arm64: Unify WORKAROUND_SPECULATIVE_AT_{NVHE,VHE}Andrew Scull2020-05-048-58/+50
| | |/
| * | Merge branch 'for-next/bti' into for-next/coreWill Deacon2020-05-2875-219/+963
| |\ \
| | * | arm64: vdso: Fix CFI directives in sigreturn trampolineWill Deacon2020-05-212-7/+40
| | * | arm64: vdso: Don't prefix sigreturn trampoline with a BTI C instructionWill Deacon2020-05-213-13/+20
| | * | arm64: bti: Fix support for userspace only BTIMark Brown2020-05-121-0/+8
| | * | arm64: kconfig: Update and comment GCC version check for kernel BTIWill Deacon2020-05-121-1/+2
| | * | arm64: vdso: Map the vDSO text with guarded pages when built for BTIMark Brown2020-05-071-1/+5
| | * | arm64: vdso: Force the vDSO to be linked as BTI when built for BTIMark Brown2020-05-071-1/+3
| | * | arm64: vdso: Annotate for BTIMark Brown2020-05-073-0/+9
| | * | arm64: asm: Provide a mechanism for generating ELF note for BTIMark Brown2020-05-071-0/+50
| | * | arm64: bti: Provide Kconfig for kernel mode BTIMark Brown2020-05-071-0/+19
| | * | arm64: mm: Mark executable text as guarded pagesMark Brown2020-05-071-2/+2
| | * | arm64: bpf: Annotate JITed code for BTIMark Brown2020-05-072-0/+20
| | * | arm64: Set GP bit in kernel page tables to enable BTI for the kernelMark Brown2020-05-073-0/+31
| | * | arm64: asm: Override SYM_FUNC_START when building the kernel with BTIMark Brown2020-05-071-0/+46
| | * | arm64: bti: Support building kernel C code using BTIMark Brown2020-05-071-0/+4
| | * | arm64: Document why we enable PAC support for leaf functionsMark Brown2020-05-071-0/+3
| | | |
| | | \
| | *-. \ Merge branches 'for-next/asm' and 'for-next/insn' into for-next/btiWill Deacon2020-05-0527-126/+144
| | |\ \ \
| | | | * | arm64: insn: Report PAC and BTI instructions as skippableMark Brown2020-05-041-0/+17
| | | | * | arm64: insn: Don't assume unrecognized HINTs are skippableMark Brown2020-05-041-7/+3
| | | | * | arm64: insn: Provide a better name for aarch64_insn_is_nop()Mark Brown2020-05-043-4/+3
| | | | * | arm64: insn: Add constants for new HINT instruction decodeMark Brown2020-05-042-3/+27
| | | | |/
| | | * | arm64: Disable old style assembly annotationsMark Brown2020-05-041-0/+1
| | | * | arm64: kernel: Convert to modern annotations for assembly functionsMark Brown2020-05-0410-68/+68
| | | * | arm64: entry: Refactor and modernise annotation for ret_to_userMark Brown2020-05-041-13/+14
| | | * | Merge branch 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/t...Will Deacon2020-04-3012-31/+11
| | | |\ \ | | | | |/ | | | |/|
| | | | * x86/asm: Provide a Kconfig symbol for disabling old assembly annotationsMark Brown2020-04-183-4/+8