History

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

Linus Torvalds committed 2 years ago

Commit aa486552 parents eb5b0f9 cb088e316 files · +104 −15Browse files

Showing the changes to tools/include/linux/string.h (1 of 16 files). Show all

Unified · Split

tools/include/linux/string.h+3−0
@@ -12,6 +12,8 @@ void argv_free(char **argv); · 11 unmodified lines
1212
1313 int strtobool(const char *s, bool *res);
1414
15+#define strscpy strcpy
16+
1517 /*
1618 * glibc based builds needs the extern while uClibc doesn't.
1719 * However uClibc headers also define __GLIBC__ hence the hack below
@@ -49,4 +51,5 @@ extern char *strim(char *); · 31 unmodified lines
4951 extern void remove_spaces(char *s);
5052
5153 extern void *memchr_inv(const void *start, int c, size_t bytes);
54+extern unsigned long long memparse(const char *ptr, char **retptr);
5255 #endif /* _TOOLS_LINUX_STRING_H_ */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t