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
Showing the changes to tools/include/linux/string.h (1 of 16 files). Show all
Unified · Split
| @@ -12,6 +12,8 @@ void argv_free(char **argv); · 11 unmodified lines | |||
| 12 | 12 | ||
| 13 | int strtobool(const char *s, bool *res); | 13 | int strtobool(const char *s, bool *res); |
| 14 | 14 | ||
| 15 | #define strscpy strcpy | ||
| 16 | |||
| 15 | /* | 17 | /* |
| 16 | * glibc based builds needs the extern while uClibc doesn't. | 18 | * glibc based builds needs the extern while uClibc doesn't. |
| 17 | * However uClibc headers also define __GLIBC__ hence the hack below | 19 | * However uClibc headers also define __GLIBC__ hence the hack below |
| @@ -49,4 +51,5 @@ extern char *strim(char *); · 31 unmodified lines | |||
| 49 | extern void remove_spaces(char *s); | 51 | extern void remove_spaces(char *s); |
| 50 | 52 | ||
| 51 | extern void *memchr_inv(const void *start, int c, size_t bytes); | 53 | extern void *memchr_inv(const void *start, int c, size_t bytes); |
| 54 | extern unsigned long long memparse(const char *ptr, char **retptr); | ||
| 52 | #endif /* _TOOLS_LINUX_STRING_H_ */ | 55 | #endif /* _TOOLS_LINUX_STRING_H_ */ |