From: Will Deacon Date: Tue, 5 May 2020 14:19:09 +0000 (+0100) Subject: Merge branches 'for-next/asm' and 'for-next/insn' into for-next/bti X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e5159827e057487359fc76f496a16ddbb8536cc9;p=linux.git 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 --- e5159827e057487359fc76f496a16ddbb8536cc9 diff --cc arch/arm64/Kconfig index 43be825d0730a,dd007e9ce5963,40fb05d96c607..6f199d8146d46 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@@ -63,9 -61,9 -61,8 +63,10 @@@@ config ARM6 select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION select ARCH_KEEP_MEMBLOCK select ARCH_USE_CMPXCHG_LOCKREF ++ select ARCH_USE_GNU_PROPERTY select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS + + select ARCH_USE_SYM_ANNOTATIONS select ARCH_SUPPORTS_MEMORY_FAILURE select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 && (GCC_VERSION >= 50000 || CC_IS_CLANG)