# 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-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 5e74df2f8f15eaa1ebbdfc1f6fef27a26d789de8 # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/vdso/vma.c:246:12: error: no previous prototype for 'init_vdso_image' [-Werror=missing-prototypes] int __init init_vdso_image(const struct vdso_image *image, ^ /kisskb/src/arch/sparc/power/hibernate.c:22:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] int pfn_is_nosave(unsigned long pfn) ^ /kisskb/src/arch/sparc/power/hibernate.c:30:6: error: no previous prototype for 'save_processor_state' [-Werror=missing-prototypes] void save_processor_state(void) ^ /kisskb/src/arch/sparc/power/hibernate.c:35:6: error: no previous prototype for 'restore_processor_state' [-Werror=missing-prototypes] void restore_processor_state(void) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/power/hibernate.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/power] Error 2 make[3]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/vdso/vma.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/vdso] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: error: no previous prototype for 'is_no_fault_exception' [-Werror=missing-prototypes] bool is_no_fault_exception(struct pt_regs *regs) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: error: no previous prototype for 'do_mcd_err' [-Werror=missing-prototypes] void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: error: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Werror=missing-prototypes] bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, ^ /kisskb/src/arch/sparc/prom/misc_64.c:165:5: error: no previous prototype for 'prom_get_mmu_ihandle' [-Werror=missing-prototypes] int prom_get_mmu_ihandle(void) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/prom/misc_64.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/prom] Error 2 cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/kernel/traps_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/kernel] Error 2 /kisskb/src/arch/sparc/mm/init_64.c:2644:6: error: no previous prototype for 'vmemmap_free' [-Werror=missing-prototypes] void vmemmap_free(unsigned long start, unsigned long end, ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sparc/mm/init_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sparc] Error 2 In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5:0, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:200:13: error: no previous prototype for 'sparc_floppy_irq' [-Werror=missing-prototypes] irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie) ^ In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5:0, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:437:6: error: no previous prototype for 'sun_pci_fd_dma_callback' [-Werror=missing-prototypes] void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/block/floppy.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/block] Error 2 make[4]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:17:0: /kisskb/src/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h:924:19: error: 'gen7_0_0_external_core_regs' defined but not used [-Werror=unused-variable] static const u32 *gen7_0_0_external_core_regs[] = { ^ In file included from /kisskb/src/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:18:0: /kisskb/src/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h:748:19: error: 'gen7_2_0_external_core_regs' defined but not used [-Werror=unused-variable] static const u32 *gen7_2_0_external_core_regs[] = { ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[7]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/gpu/drm/msm/adreno/a6xx_gpu_state.o] Error 1 make[7]: *** Waiting for unfinished jobs.... make[6]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/gpu/drm/msm] Error 2 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/gpu/drm] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/gpu] Error 2 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 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sparc64-gcc5 # Build took: 0:03:55.840420