diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 22:01:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 22:01:23 +0100 |
| commit | 7b7028edf939f6ab3bb7465937b33dd714020fa8 (patch) | |
| tree | d3e1dc8bb66b075454460d4b0736ecf49a9fbb25 /mm/memblock.c | |
| parent | Merge tag 'kgdb-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/da... (diff) | |
| parent | mm: memblock: remove return value of memblock_free_all() (diff) | |
| download | linux-7b7028edf939f6ab3bb7465937b33dd714020fa8.tar.xz linux-7b7028edf939f6ab3bb7465937b33dd714020fa8.zip | |
Merge tag 'memblock-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock update from Mike Rapoport:
"Remove return value of memblock_free_all()
memblock_free_all() returns the total count of freed pages and its
callers used this value to update totalram_pages. This update is now
anyway a part of memblock_free_all() and its callers no longer check
the return value, so make memblock_free_all() void"
* tag 'memblock-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
mm: memblock: remove return value of memblock_free_all()
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 8d9b5f1e7040..afaefa8fc6ab 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2050,10 +2050,8 @@ void __init reset_all_zones_managed_pages(void) /** * memblock_free_all - release free pages to the buddy allocator - * - * Return: the number of pages actually released. */ -unsigned long __init memblock_free_all(void) +void __init memblock_free_all(void) { unsigned long pages; @@ -2062,8 +2060,6 @@ unsigned long __init memblock_free_all(void) pages = free_low_memory_core_early(); totalram_pages_add(pages); - - return pages; } #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_ARCH_KEEP_MEMBLOCK) |