Commit 570365d3 authored by Will Deacon's avatar Will Deacon
Browse files

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
parents 84d8857a 3381da25

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ config HAVE_FUNCTION_DESCRIPTORS 
config TRACE_IRQFLAGS_SUPPORT

	bool



config TRACE_IRQFLAGS_NMI_SUPPORT

	bool



#

# An arch should select this if it provides all these things:

#

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ config X86 
	select SYSCTL_EXCEPTION_TRACE

	select THREAD_INFO_IN_TASK

	select TRACE_IRQFLAGS_SUPPORT

	select TRACE_IRQFLAGS_NMI_SUPPORT

	select USER_STACKTRACE_SUPPORT

	select VIRT_TO_BUS

	select HAVE_ARCH_KCSAN			if X86_64

arch/x86/Kconfig.debug

+0 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



config TRACE_IRQFLAGS_NMI_SUPPORT

	def_bool y



config EARLY_PRINTK_USB

	bool