# 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_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_defconfig_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_defconfig_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_defconfig_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/sh4/fpu.c:389:6: warning: no previous prototype for 'float_raise' [-Wmissing-prototypes] 389 | void float_raise(unsigned int flags) | ^~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/fpu.c:394:5: warning: no previous prototype for 'float_rounding_mode' [-Wmissing-prototypes] 394 | int float_rounding_mode(void) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/cache-sh4.c:384:13: warning: no previous prototype for 'sh4_cache_init' [-Wmissing-prototypes] 384 | void __init sh4_cache_init(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/cache-shx3.c:18:13: warning: no previous prototype for 'shx3_cache_init' [-Wmissing-prototypes] 18 | void __init shx3_cache_init(void) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/flush-sh4.c:106:13: warning: no previous prototype for 'sh4__flush_region_init' [-Wmissing-prototypes] 106 | void __init sh4__flush_region_init(void) | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:10:6: warning: no previous prototype for 'pgd_ctor' [-Wmissing-prototypes] 10 | void pgd_ctor(void *x) | ^~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:32:8: warning: no previous prototype for 'pgd_alloc' [-Wmissing-prototypes] 32 | pgd_t *pgd_alloc(struct mm_struct *mm) | ^~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:37:6: warning: no previous prototype for 'pgd_free' [-Wmissing-prototypes] 37 | void pgd_free(struct mm_struct *mm, pgd_t *pgd) | ^~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:43:6: warning: no previous prototype for 'pud_populate' [-Wmissing-prototypes] 43 | void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) | ^~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:48:8: warning: no previous prototype for 'pmd_alloc_one' [-Wmissing-prototypes] 48 | pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:53:6: warning: no previous prototype for 'pmd_free' [-Wmissing-prototypes] 53 | void pmd_free(struct mm_struct *mm, pmd_t *pmd) | ^~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: warning: no previous prototype for 'l2_cache_init' [-Wmissing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/tlbex_32.c:22:1: warning: no previous prototype for 'handle_tlbmiss' [-Wmissing-prototypes] 22 | handle_tlbmiss(struct pt_regs *regs, unsigned long error_code, | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/return_address.c:49:7: warning: no previous prototype for 'return_address' [-Wmissing-prototypes] 49 | void *return_address(unsigned int depth) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/sys_sh.c:58:16: warning: no previous prototype for 'sys_cacheflush' [-Wmissing-prototypes] 58 | asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/traps_32.c:735:6: warning: no previous prototype for 'per_cpu_trap_init' [-Wmissing-prototypes] 735 | void per_cpu_trap_init(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/smp.c:173:17: warning: no previous prototype for 'start_secondary' [-Wmissing-prototypes] 173 | asmlinkage void start_secondary(void) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/smp.c:324:5: warning: no previous prototype for 'setup_profiling_timer' [-Wmissing-prototypes] 324 | int setup_profiling_timer(unsigned int multiplier) | ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/kprobes.c:52:16: warning: no previous prototype for 'arch_copy_kprobe' [-Wmissing-prototypes] 52 | void __kprobes arch_copy_kprobe(struct kprobe *p) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/kprobes.c:304:15: warning: no previous prototype for 'trampoline_probe_handler' [-Wmissing-prototypes] 304 | int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_spin_lock' [-Wmissing-prototypes] 68 | void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_spin_lock_irqsave' [-Wmissing-prototypes] 80 | unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_spin_lock_irq' [-Wmissing-prototypes] 98 | void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_spin_lock_bh' [-Wmissing-prototypes] 103 | void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_read_lock' [-Wmissing-prototypes] 68 | void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_read_lock_irqsave' [-Wmissing-prototypes] 80 | unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_read_lock_irq' [-Wmissing-prototypes] 98 | void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_read_lock_bh' [-Wmissing-prototypes] 103 | void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_write_lock' [-Wmissing-prototypes] 68 | void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_write_lock_irqsave' [-Wmissing-prototypes] 80 | unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_write_lock_irq' [-Wmissing-prototypes] 98 | void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_write_lock_bh' [-Wmissing-prototypes] 103 | void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/hw_breakpoint.c:135:5: warning: no previous prototype for 'arch_bp_generic_fields' [-Wmissing-prototypes] 135 | int arch_bp_generic_fields(int sh_len, int sh_type, | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/ext4/readpage.c: In function 'ext4_mpage_readpages': /kisskb/src/fs/ext4/readpage.c:392:1: warning: the frame size of 1120 bytes is larger than 1024 bytes [-Wframe-larger-than=] 392 | } | ^ /kisskb/src/arch/sh/boot/compressed/cache.c:2:5: warning: no previous prototype for 'cache_control' [-Wmissing-prototypes] 2 | int cache_control(unsigned int command) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:115:6: warning: no previous prototype for 'ftrace_stub' [-Wmissing-prototypes] 115 | void ftrace_stub(void) | ^~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:118:6: warning: no previous prototype for 'arch_ftrace_ops_list_func' [-Wmissing-prototypes] 118 | void arch_ftrace_ops_list_func(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:128:6: warning: no previous prototype for 'decompress_kernel' [-Wmissing-prototypes] 128 | void decompress_kernel(void) | ^~~~~~~~~~~~~~~~~ Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_defconfig_sh4-gcc13 # Build took: 0:00:55.008841