Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-28 16:52:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git

Browse Source
This commit is contained in:
Stephen Rothwell 2024-12-20 10:41:51 +11:00
commit 3aa602263e
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_bp[XCHAL_NUM_IBREAK];
struct perf_event *ptrace_wp[XCHAL_NUM_DBREAK]; struct perf_event *ptrace_wp[XCHAL_NUM_DBREAK];
#endif #endif
/* Make structure 16 bytes aligned. */ } __aligned(16);
int align[0] __attribute__ ((aligned(16)));
};
/* This decides where the kernel will search for a free chunk of vm /* This decides where the kernel will search for a free chunk of vm
* space during mmap's. * space during mmap's.

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

@ -55,7 +55,7 @@ extern int initrd_below_start_ok;
#endif #endif
#ifdef CONFIG_USE_OF #ifdef CONFIG_USE_OF
void *dtb_start = __dtb_start; static void *dtb_start __initdata = __dtb_start;
#endif #endif
extern unsigned long loops_per_jiffy; 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/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/string_choices.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/bio.h> #include <linux/bio.h>
#include <linux/proc_fs.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) { if (offset > dev->size || dev->size - offset < nbytes) {
pr_notice("Beyond-end %s (%ld %ld)\n", pr_notice("Beyond-end %s (%ld %ld)\n",
write ? "write" : "read", offset, nbytes); str_write_read(write), offset, nbytes);
return; return;
} }