From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Sep 2024 18:35:19 +0000 (-0700)
Subject: Merge tag 'memblock-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt... 
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=aa486552a110fd6e625bb66b7edf0e0df7389a1a;p=linux.git

Merge tag 'memblock-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Pull memblock updates from Mike Rapoport:

 - new memblock_estimated_nr_free_pages() helper to replace
   totalram_pages() which is less accurate when
   CONFIG_DEFERRED_STRUCT_PAGE_INIT is set

 - fixes for memblock tests

* tag 'memblock-v6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  s390/mm: get estimated free pages by memblock api
  kernel/fork.c: get estimated free pages by memblock api
  mm/memblock: introduce a new helper memblock_estimated_nr_free_pages()
  memblock test: fix implicit declaration of function 'strscpy'
  memblock test: fix implicit declaration of function 'isspace'
  memblock test: fix implicit declaration of function 'memparse'
  memblock test: add the definition of __setup()
  memblock test: fix implicit declaration of function 'virt_to_phys'
  tools/testing: abstract two init.h into common include directory
  memblock tests: include export.h in linkage.h as kernel dose
  memblock tests: include memory_hotplug.h in mmzone.h as kernel dose
---

aa486552a110fd6e625bb66b7edf0e0df7389a1a
diff --cc tools/include/linux/linkage.h
index a48ff086899c,20dee24d7e1b..b7183576d8eb
--- a/tools/include/linux/linkage.h
+++ b/tools/include/linux/linkage.h
@@@ -1,8 -1,6 +1,10 @@@
  #ifndef _TOOLS_INCLUDE_LINUX_LINKAGE_H
  #define _TOOLS_INCLUDE_LINUX_LINKAGE_H
  
+ #include <linux/export.h>
+ 
 +#define SYM_FUNC_START(x) .globl x; x:
 +
 +#define SYM_FUNC_END(x)
 +
  #endif /* _TOOLS_INCLUDE_LINUX_LINKAGE_H */
diff --cc tools/include/linux/string.h
index 0acb1fc14e19,41e7fa734922..8499f509f03e
--- a/tools/include/linux/string.h
+++ b/tools/include/linux/string.h
@@@ -46,7 -48,6 +48,8 @@@ extern char * __must_check skip_spaces(
  
  extern char *strim(char *);
  
 +extern void remove_spaces(char *s);
 +
  extern void *memchr_inv(const void *start, int c, size_t bytes);
+ extern unsigned long long memparse(const char *ptr, char **retptr);
  #endif /* _TOOLS_LINUX_STRING_H_ */