Skip to content

Commit ae38135

Browse files
committed
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
2 parents 9c5968d + d14b9a7 commit ae38135

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

arch/xtensa/include/asm/processor.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ struct thread_struct {
160160
struct perf_event *ptrace_bp[XCHAL_NUM_IBREAK];
161161
struct perf_event *ptrace_wp[XCHAL_NUM_DBREAK];
162162
#endif
163-
/* Make structure 16 bytes aligned. */
164-
int align[0] __attribute__ ((aligned(16)));
165-
};
163+
} __aligned(16);
166164

167165
/* This decides where the kernel will search for a free chunk of vm
168166
* space during mmap's.

arch/xtensa/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ extern int initrd_below_start_ok;
5555
#endif
5656

5757
#ifdef CONFIG_USE_OF
58-
void *dtb_start = __dtb_start;
58+
static void *dtb_start __initdata = __dtb_start;
5959
#endif
6060

6161
extern unsigned long loops_per_jiffy;

arch/xtensa/platforms/iss/simdisk.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/kernel.h>
1515
#include <linux/init.h>
1616
#include <linux/string.h>
17+
#include <linux/string_choices.h>
1718
#include <linux/blkdev.h>
1819
#include <linux/bio.h>
1920
#include <linux/proc_fs.h>
@@ -75,7 +76,7 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,
7576

7677
if (offset > dev->size || dev->size - offset < nbytes) {
7778
pr_notice("Beyond-end %s (%ld %ld)\n",
78-
write ? "write" : "read", offset, nbytes);
79+
str_write_read(write), offset, nbytes);
7980
return;
8081
}
8182

0 commit comments

Comments
 (0)