# git rev-parse -q --verify 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8^{commit} 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 already have revision, skipping fetch # git checkout -q -f -B kisskb 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # git clean -qxdf # < git log -1 # commit 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # Merge: b136f68eb00d 9843231c9726 # Author: Linus Torvalds # Date: Sun Mar 24 11:13:56 2024 -0700 # # Merge tag 'x86-urgent-2024-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 fixes from Thomas Gleixner: # # - Ensure that the encryption mask at boot is properly propagated on # 5-level page tables, otherwise the PGD entry is incorrectly set to # non-encrypted, which causes system crashes during boot. # # - Undo the deferred 5-level page table setup as it cannot work with # memory encryption enabled. # # - Prevent inconsistent XFD state on CPU hotplug, where the MSR is reset # to the default value but the cached variable is not, so subsequent # comparisons might yield the wrong result and as a consequence the # result prevents updating the MSR. # # - Register the local APIC address only once in the MPPARSE enumeration # to prevent triggering the related WARN_ONs() in the APIC and topology # code. # # - Handle the case where no APIC is found gracefully by registering a # fake APIC in the topology code. That makes all related topology # functions work correctly and does not affect the actual APIC driver # code at all. # # - Don't evaluate logical IDs during early boot as the local APIC IDs # are not yet enumerated and the invoked function returns an error # code. Nothing requires the logical IDs before the final CPUID # enumeration takes place, which happens after the enumeration. # # - Cure the fallout of the per CPU rework on UP which misplaced the # copying of boot_cpu_data to per CPU data so that the final update to # boot_cpu_data got lost which caused inconsistent state and boot # crashes. # # - Use copy_from_kernel_nofault() in the kprobes setup as there is no # guarantee that the address can be safely accessed. # # - Reorder struct members in struct saved_context to work around another # kmemleak false positive # # - Remove the buggy code which tries to update the E820 kexec table for # setup_data as that is never passed to the kexec kernel. # # - Update the resource control documentation to use the proper units. # # - Fix a Kconfig warning observed with tinyconfig # # * tag 'x86-urgent-2024-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/boot/64: Move 5-level paging global variable assignments back # x86/boot/64: Apply encryption mask to 5-level pagetable update # x86/cpu: Add model number for another Intel Arrow Lake mobile processor # x86/fpu: Keep xfd_state in sync with MSR_IA32_XFD # Documentation/x86: Document that resctrl bandwidth control units are MiB # x86/mpparse: Register APIC address only once # x86/topology: Handle the !APIC case gracefully # x86/topology: Don't evaluate logical IDs during early boot # x86/cpu: Ensure that CPU info updates are propagated on UP # kprobes/x86: Use copy_from_kernel_nofault() to read from unsafe address # x86/pm: Work around false positive kmemleak report in msr_build_context() # x86/kexec: Do not update E820 kexec table for setup_data # x86/config: Fix warning for 'make ARCH=x86_64 tinyconfig' # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/math-emu/math.c:492:5: error: no previous prototype for 'do_fpu_inst' [-Werror=missing-prototypes] 492 | int do_fpu_inst(unsigned short inst, struct pt_regs *regs) | ^~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: error: no previous prototype for 'l2_cache_init' [-Werror=missing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/kernel/cpu/init.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/kernel/cpu] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/kernel] Error 2 make[4]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/math-emu/math.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/math-emu] Error 2 /kisskb/src/arch/sh/mm/cache-sh2.c:85:13: error: no previous prototype for 'sh2_cache_init' [-Werror=missing-prototypes] 85 | void __init sh2_cache_init(void) | ^~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/mm/cache-sh2.o] Error 1 make[5]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sh/mm/nommu.c:76:13: error: no previous prototype for 'kmap_coherent_init' [-Werror=missing-prototypes] 76 | void __init kmap_coherent_init(void) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:80:7: error: no previous prototype for 'kmap_coherent' [-Werror=missing-prototypes] 80 | void *kmap_coherent(struct page *page, unsigned long addr) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:86:6: error: no previous prototype for 'kunmap_coherent' [-Werror=missing-prototypes] 86 | void kunmap_coherent(void *kvaddr) | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/mm/nommu.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh] Error 2 make[3]: *** Waiting for unfinished jobs.... {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:1099: Error: missing operand {standard input}:1099: Error: missing operand {standard input}:1099: Error: invalid operands for opcode {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. make[6]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/net/pcs/pcs-xpcs.o] Error 4 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/net/pcs] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/net] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1919: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sh4-gcc13 # Build took: 0:08:18.817344