summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 13:01:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 13:01:23 -0800
commit7b7028edf939f6ab3bb7465937b33dd714020fa8 (patch)
treed3e1dc8bb66b075454460d4b0736ecf49a9fbb25 /include
parent899cbb0e53c6b66c3fb98d8745aa4b0b41cd94f2 (diff)
parent097d43d8570457c1af9b09fab15412697b177f35 (diff)
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 'include')
-rw-r--r--include/linux/memblock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 9cc6da7b513e..c88bc24e31aa 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -117,7 +117,7 @@ int memblock_mark_mirror(phys_addr_t base, phys_addr_t size);
int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);
int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);
-unsigned long memblock_free_all(void);
+void memblock_free_all(void);
void reset_node_managed_pages(pg_data_t *pgdat);
void reset_all_zones_managed_pages(void);