From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2025 19:25:03 +0000 (-0700)
Subject: Merge tag 'uml-for-linux-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.15-rc1~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a6b94032e0077ae15b21e7b42a9599bdc18ea22;p=thirdparty%2Flinux.git

Merge tag 'uml-for-linux-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux

Pull UML updates from Johannes Berg:

 - proper nofault accesses and read-only rodata

 - hostfs fix for host inode number reuse

 - fixes for host errno handling

 - various cleanups/small fixes

* tag 'uml-for-linux-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  um: Rewrite the sigio workaround based on epoll and tgkill
  um: Prohibit the VM_CLONE flag in run_helper_thread()
  um: Switch to the pthread-based helper in sigio workaround
  um: ubd: Switch to the pthread-based helper
  um: Add pthread-based helper support
  um: x86: clean up elf specific definitions
  um: Store full CSGSFS and SS register from mcontext
  um: virt-pci: Refactor virtio_pcidev into its own module
  um: work around sched_yield not yielding in time-travel mode
  um/locking: Remove semicolon from "lock" prefix
  um: Update min_low_pfn to match changes in uml_reserved
  um: use str_yes_no() to remove hardcoded "yes" and "no"
  um: hostfs: avoid issues on inode number reuse by host
  um: Allocate vdso page pointer statically
  um: remove copy_from_kernel_nofault_allowed
  um: mark rodata read-only and implement _nofault accesses
  um: Pass the correct Rust target and options with gcc
---

8a6b94032e0077ae15b21e7b42a9599bdc18ea22
diff --cc arch/um/kernel/mem.c
index 379f33a1babfd,61b5a5ede01c1..76bec7de81b52
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@@ -66,11 -68,11 +68,12 @@@ void __init arch_mm_preinit(void
  	map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
  	memblock_free((void *)brk_end, uml_reserved - brk_end);
  	uml_reserved = brk_end;
+ 	min_low_pfn = PFN_UP(__pa(uml_reserved));
 -
 -	/* this will put all low memory onto the freelists */
 -	memblock_free_all();
  	max_pfn = max_low_pfn;
 +}
 +
 +void __init mem_init(void)
 +{
  	kmalloc_ok = 1;
  }