diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-09 04:19:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-09 04:19:59 +0300 |
| commit | f73857ece4d85d2ee36571df9c13a733f3ba2732 (patch) | |
| tree | c1cf6264a4415b4a4a9b6b18efe78040609990f5 /arch/x86/boot/compressed/ident_map_64.c | |
| parent | 106b88d7a91e2b4d40369a20b8ef07bb827dafd5 (diff) | |
| parent | 257ca14f4d780e27a0605fd68053d2cc3178a232 (diff) | |
| download | linux-f73857ece4d85d2ee36571df9c13a733f3ba2732.tar.xz | |
Merge tag 'x86-boot-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
- Ignore NMIs during very early boot, to address kexec crashes
- Remove redundant initialization in boot/string.c's strcmp()
* tag 'x86-boot-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Remove redundant initialization of the 'delta' variable in strcmp()
x86/boot: Ignore NMIs during very early boot
Diffstat (limited to 'arch/x86/boot/compressed/ident_map_64.c')
| -rw-r--r-- | arch/x86/boot/compressed/ident_map_64.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compressed/ident_map_64.c index 473ba59b82a8..d040080d7edb 100644 --- a/arch/x86/boot/compressed/ident_map_64.c +++ b/arch/x86/boot/compressed/ident_map_64.c @@ -386,3 +386,8 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code) */ kernel_add_identity_map(address, end); } + +void do_boot_nmi_trap(struct pt_regs *regs, unsigned long error_code) +{ + /* Empty handler to ignore NMI during early boot */ +} |