mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
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
This commit is contained in:
commit
570365d365
4 changed files with 5 additions and 3 deletions
|
@ -223,6 +223,9 @@ config HAVE_FUNCTION_DESCRIPTORS
|
||||||
config TRACE_IRQFLAGS_SUPPORT
|
config TRACE_IRQFLAGS_SUPPORT
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config TRACE_IRQFLAGS_NMI_SUPPORT
|
||||||
|
bool
|
||||||
|
|
||||||
#
|
#
|
||||||
# An arch should select this if it provides all these things:
|
# An arch should select this if it provides all these things:
|
||||||
#
|
#
|
||||||
|
|
|
@ -228,6 +228,7 @@ config ARM64
|
||||||
select THREAD_INFO_IN_TASK
|
select THREAD_INFO_IN_TASK
|
||||||
select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD
|
select HAVE_ARCH_USERFAULTFD_MINOR if USERFAULTFD
|
||||||
select TRACE_IRQFLAGS_SUPPORT
|
select TRACE_IRQFLAGS_SUPPORT
|
||||||
|
select TRACE_IRQFLAGS_NMI_SUPPORT
|
||||||
help
|
help
|
||||||
ARM 64-bit (AArch64) Linux support.
|
ARM 64-bit (AArch64) Linux support.
|
||||||
|
|
||||||
|
|
|
@ -277,6 +277,7 @@ config X86
|
||||||
select SYSCTL_EXCEPTION_TRACE
|
select SYSCTL_EXCEPTION_TRACE
|
||||||
select THREAD_INFO_IN_TASK
|
select THREAD_INFO_IN_TASK
|
||||||
select TRACE_IRQFLAGS_SUPPORT
|
select TRACE_IRQFLAGS_SUPPORT
|
||||||
|
select TRACE_IRQFLAGS_NMI_SUPPORT
|
||||||
select USER_STACKTRACE_SUPPORT
|
select USER_STACKTRACE_SUPPORT
|
||||||
select VIRT_TO_BUS
|
select VIRT_TO_BUS
|
||||||
select HAVE_ARCH_KCSAN if X86_64
|
select HAVE_ARCH_KCSAN if X86_64
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
|
|
||||||
config TRACE_IRQFLAGS_NMI_SUPPORT
|
|
||||||
def_bool y
|
|
||||||
|
|
||||||
config EARLY_PRINTK_USB
|
config EARLY_PRINTK_USB
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue