diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:46:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-13 10:46:04 +0200 |
| commit | d6680b0077af6a86cc28d2ac8bd7fa224d7f3b0b (patch) | |
| tree | 598ad0f3f4d08240f5879ac0dd801c9257743e22 /arch/x86/kernel/dumpstack.c | |
| parent | 1f82e8e1ca18aa0b020538a3f227f5d56382638e (diff) | |
| parent | f2e01dcf6df2d12e86c363ea9c37d53994d89dd6 (diff) | |
Merge branch 'x86/nmi' into x86/core, to merge dependent commits
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:
6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index c6fefd4585f8..71ee20102a8a 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -23,8 +23,6 @@ #include <asm/stacktrace.h> #include <asm/unwind.h> -int panic_on_unrecovered_nmi; -int panic_on_io_nmi; static int die_counter; static struct pt_regs exec_summary_regs; |