diff options
author | Will Deacon <will@kernel.org> | 2022-07-25 12:56:31 +0300 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2022-07-25 12:56:31 +0300 |
commit | 570365d365ddd28da2cf33b0cdfbe8c79ba67275 (patch) | |
tree | be018e6fc55630cb7a7826dfca83cbcdeea85f6b /arch/arm64 | |
parent | 84d8857af43a9d4289c53955f4d221ebda548b97 (diff) | |
parent | 3381da254fab37ba08c4b7c4f19b4ee28b1a27ec (diff) | |
download | linux-570365d365ddd28da2cf33b0cdfbe8c79ba67275.tar.xz |
Merge branch 'for-next/irqflags-nmi' into for-next/core
* for-next/irqflags-nmi:
arm64: select TRACE_IRQFLAGS_NMI_SUPPORT
arch: make TRACE_IRQFLAGS_NMI_SUPPORT generic
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 78607fe5f0f8..b048561bd2a6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -228,6 +228,7 @@ config ARM64 select THREAD_INFO_IN_TASK select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD select TRACE_IRQFLAGS_SUPPORT + select TRACE_IRQFLAGS_NMI_SUPPORT help ARM 64-bit (AArch64) Linux support. |