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

Merge tag 'xtensa-20250126' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa updates from Max Filippov:

- a few one-liner cleanups

* tag 'xtensa-20250126' of https://github.com/jcmvbkbc/linux-xtensa:
xtensa/simdisk: Use str_write_read() helper in simdisk_transfer()
xtensa: Remove zero-length alignment array
xtensa: annotate dtb_start variable as static __initdata

+4 -5
+1 -3
arch/xtensa/include/asm/processor.h
··· 160 160 struct perf_event *ptrace_bp[XCHAL_NUM_IBREAK]; 161 161 struct perf_event *ptrace_wp[XCHAL_NUM_DBREAK]; 162 162 #endif 163 - /* Make structure 16 bytes aligned. */ 164 - int align[0] __attribute__ ((aligned(16))); 165 - }; 163 + } __aligned(16); 166 164 167 165 /* This decides where the kernel will search for a free chunk of vm 168 166 * space during mmap's.
+1 -1
arch/xtensa/kernel/setup.c
··· 55 55 #endif 56 56 57 57 #ifdef CONFIG_USE_OF 58 - void *dtb_start = __dtb_start; 58 + static void *dtb_start __initdata = __dtb_start; 59 59 #endif 60 60 61 61 extern unsigned long loops_per_jiffy;
+2 -1
arch/xtensa/platforms/iss/simdisk.c
··· 14 14 #include <linux/kernel.h> 15 15 #include <linux/init.h> 16 16 #include <linux/string.h> 17 + #include <linux/string_choices.h> 17 18 #include <linux/blkdev.h> 18 19 #include <linux/bio.h> 19 20 #include <linux/proc_fs.h> ··· 76 75 77 76 if (offset > dev->size || dev->size - offset < nbytes) { 78 77 pr_notice("Beyond-end %s (%ld %ld)\n", 79 - write ? "write" : "read", offset, nbytes); 78 + str_write_read(write), offset, nbytes); 80 79 return; 81 80 } 82 81