From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 May 2024 20:17:48 +0000 (-0700)
Subject: Merge tag 'uml-for-linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: nvme-6.10-2024-06-05~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2313022ec5942e3ddd2e4e57002ed71926887f87;p=nvme.git

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

Pull UML updates from Richard Weinberger:

 - Fixes for -Wmissing-prototypes warnings and further cleanup

 - Remove callback returning void from rtc and virtio drivers

 - Fix bash location

* tag 'uml-for-linus-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: (26 commits)
  um: virtio_uml: Convert to platform remove callback returning void
  um: rtc: Convert to platform remove callback returning void
  um: Remove unused do_get_thread_area function
  um: Fix -Wmissing-prototypes warnings for __vdso_*
  um: Add an internal header shared among the user code
  um: Fix the declaration of kasan_map_memory
  um: Fix the -Wmissing-prototypes warning for get_thread_reg
  um: Fix the -Wmissing-prototypes warning for __switch_mm
  um: Fix -Wmissing-prototypes warnings for (rt_)sigreturn
  um: Stop tracking host PID in cpu_tasks
  um: process: remove unused 'n' variable
  um: vector: remove unused len variable/calculation
  um: vector: fix bpfflash parameter evaluation
  um: slirp: remove set but unused variable 'pid'
  um: signal: move pid variable where needed
  um: Makefile: use bash from the environment
  um: Add winch to winch_handlers before registering winch IRQ
  um: Fix -Wmissing-prototypes warnings for __warp_* and foo
  um: Fix -Wmissing-prototypes warnings for text_poke*
  um: Move declarations to proper headers
  ...
---

2313022ec5942e3ddd2e4e57002ed71926887f87
diff --cc arch/um/include/shared/um_malloc.h
index bf503658f08e,d25084447c69..815dd03e8707
--- a/arch/um/include/shared/um_malloc.h
+++ b/arch/um/include/shared/um_malloc.h
@@@ -11,9 -11,8 +11,9 @@@
  extern void *uml_kmalloc(int size, int flags);
  extern void kfree(const void *ptr);
  
 -extern void *vmalloc(unsigned long size);
 +extern void *vmalloc_noprof(unsigned long size);
 +#define vmalloc(...)		vmalloc_noprof(__VA_ARGS__)
- extern void vfree(void *ptr);
+ extern void vfree(const void *ptr);
  
  #endif /* __UM_MALLOC_H__ */