mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-04-12 15:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xtensa updates for v6.14

Browse Source 
- a few one-liner cleanups
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmeW4z0THGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRLP4D/9m1pVmG6DdOUhp57MwBL8yPeq2FcPJ
 +XNAHrYpJgwvLnnd5aa6v/rj+WNqy0Fct4A1yzCFtrWKsPwxfg20OBy5jn6ud0p9
 lYHSeAIrv0M1A6E4Iaade0ctxu6ylTI2DgdnBpkR4aJWqS6MMZCy3+rLGQQQ8lWz
 pqJfm1Zt9z6pijSBh/tTReTnyMBtYHvtSY3r25PtCP1lTHsOS8P6Zb1YdC7ttNVy
 sztEWJqOeCyEdmhPoOQE7pbenYqQNs5u1k1aIz9b9jwnLuF7hYGW5J1rfa0kXWIg
 OcCBbEDOc95mykeRjceysORJUhTnVBrfwBWbNwibGK48eAQWR0Rgm4+0vBU7TgQF
 I8k2KSr0bX5ffyhrEcQn96YneKLk6JMG4obVmFiQGXTOHO9aE25aJUYKlzSQRKDg
 CoUJ8OvMLRqFstiUO3Qz1WyPraVDj3SaG+lLAVFzi/ZDP/tRx+oNKn6YI+TmLl9h
 G+cK7b2ZWphwnfxbKmAHzjzhN47lKfDsAPrkxkDiJMLxjkD08D7UfADizDMLXizn
 5YBt3zyAfi2iMaY3zvHKkla+J5zR8j0gP7j/QqhMalausUaenOD5GaRaxsJEH7Tn
 bnG/7jPvcY/4VN5JQfLRXDPXMgCYAkKfxkyZDT+6391PZ0Swaq2lMNSuU114vke6
 J/1c3zwUzrHCYw==
 =dFxW
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-01-27 08:16:33 -08:00
commit ae38135256
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/xtensa/include/asm/processor.h
View File

@ -160,9 +160,7 @@ struct thread_struct {
struct perf_event *ptrace_bp[XCHAL_NUM_IBREAK];
struct perf_event *ptrace_wp[XCHAL_NUM_DBREAK];
#endif
/* Make structure 16 bytes aligned. */
int align[0] __attribute__ ((aligned(16)));
};
} __aligned(16);
/* This decides where the kernel will search for a free chunk of vm
* space during mmap's.

2
arch/xtensa/kernel/setup.c
View File

@ -55,7 +55,7 @@ extern int initrd_below_start_ok;
#endif
#ifdef CONFIG_USE_OF
void *dtb_start = __dtb_start;
static void *dtb_start __initdata = __dtb_start;
#endif
extern unsigned long loops_per_jiffy;

3
arch/xtensa/platforms/iss/simdisk.c
View File

@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/string_choices.h>
#include <linux/blkdev.h>
#include <linux/bio.h>
#include <linux/proc_fs.h>
@ -75,7 +76,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,
if (offset > dev->size || dev->size - offset < nbytes) {
pr_notice("Beyond-end %s (%ld %ld)\n",
write ? "write" : "read", offset, nbytes);
str_write_read(write), offset, nbytes);
return;
}