diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-09 09:48:09 +0200 |
| commit | d1eec383a8abe348b5ce72df9e96bff3d9039134 (patch) | |
| tree | 6ea912eb2d4f2bee8301a04ebf82283805218ebf /init | |
| parent | 79a4567b2e8ae4d0282602a24f76f5e2382f5b98 (diff) | |
| parent | fec50db7033ea478773b159e0e2efb135270e3b7 (diff) | |
| download | lwn-d1eec383a8abe348b5ce72df9e96bff3d9039134.tar.gz lwn-d1eec383a8abe348b5ce72df9e96bff3d9039134.zip | |
Merge tag 'v6.9-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 5 | ||||
| -rw-r--r-- | init/initramfs.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index f3ea5dea9c85..aa02aec6aa7d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1499,7 +1499,7 @@ config MULTIUSER config SGETMASK_SYSCALL bool "sgetmask/ssetmask syscalls support" if EXPERT - def_bool PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH + default PARISC || M68K || PPC || MIPS || X86 || SPARC || MICROBLAZE || SUPERH help sys_sgetmask and sys_ssetmask are obsolete system calls no longer supported in libc but still enabled by default in some @@ -1986,6 +1986,9 @@ source "kernel/Kconfig.locks" config ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE bool +config ARCH_HAS_PREPARE_SYNC_CORE_CMD + bool + config ARCH_HAS_SYNC_CORE_BEFORE_USERMODE bool diff --git a/init/initramfs.c b/init/initramfs.c index da79760b8be3..a298a3854a80 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -367,7 +367,7 @@ static int __init do_name(void) if (S_ISREG(mode)) { int ml = maybe_link(); if (ml >= 0) { - int openflags = O_WRONLY|O_CREAT; + int openflags = O_WRONLY|O_CREAT|O_LARGEFILE; if (ml != 1) openflags |= O_TRUNC; wfile = filp_open(collected, openflags, mode); @@ -682,7 +682,7 @@ static void __init populate_initrd_image(char *err) printk(KERN_INFO "rootfs image is not initramfs (%s); looks like an initrd\n", err); - file = filp_open("/initrd.image", O_WRONLY | O_CREAT, 0700); + file = filp_open("/initrd.image", O_WRONLY|O_CREAT|O_LARGEFILE, 0700); if (IS_ERR(file)) return; |