tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds f73857ec 106b88d7

+9 -1
+5
arch/x86/boot/compressed/ident_map_64.c
··· 386 386 */ 387 387 kernel_add_identity_map(address, end); 388 388 } 389 + 390 + void do_boot_nmi_trap(struct pt_regs *regs, unsigned long error_code) 391 + { 392 + /* Empty handler to ignore NMI during early boot */ 393 + }
+1
arch/x86/boot/compressed/idt_64.c
··· 61 61 boot_idt_desc.address = (unsigned long)boot_idt; 62 62 63 63 set_idt_entry(X86_TRAP_PF, boot_page_fault); 64 + set_idt_entry(X86_TRAP_NMI, boot_nmi_trap); 64 65 65 66 #ifdef CONFIG_AMD_MEM_ENCRYPT 66 67 /*
+1
arch/x86/boot/compressed/idt_handlers_64.S
··· 70 70 .code64 71 71 72 72 EXCEPTION_HANDLER boot_page_fault do_boot_page_fault error_code=1 73 + EXCEPTION_HANDLER boot_nmi_trap do_boot_nmi_trap error_code=0 73 74 74 75 #ifdef CONFIG_AMD_MEM_ENCRYPT 75 76 EXCEPTION_HANDLER boot_stage1_vc do_vc_no_ghcb error_code=1
+1
arch/x86/boot/compressed/misc.h
··· 196 196 197 197 /* IDT Entry Points */ 198 198 void boot_page_fault(void); 199 + void boot_nmi_trap(void); 199 200 void boot_stage1_vc(void); 200 201 void boot_stage2_vc(void); 201 202
+1 -1
arch/x86/boot/string.c
··· 49 49 { 50 50 const unsigned char *s1 = (const unsigned char *)str1; 51 51 const unsigned char *s2 = (const unsigned char *)str2; 52 - int delta = 0; 52 + int delta; 53 53 54 54 while (*s1 || *s2) { 55 55 delta = *s1 - *s2;