Commit 7b7028ed authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 899cbb0e 097d43d8
...@@ -117,7 +117,7 @@ int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); ...@@ -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_mark_nomap(phys_addr_t base, phys_addr_t size);
int memblock_clear_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_node_managed_pages(pg_data_t *pgdat);
void reset_all_zones_managed_pages(void); void reset_all_zones_managed_pages(void);
......
...@@ -2050,10 +2050,8 @@ void __init reset_all_zones_managed_pages(void) ...@@ -2050,10 +2050,8 @@ void __init reset_all_zones_managed_pages(void)
/** /**
* memblock_free_all - release free pages to the buddy allocator * 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; unsigned long pages;
...@@ -2062,8 +2060,6 @@ unsigned long __init memblock_free_all(void) ...@@ -2062,8 +2060,6 @@ unsigned long __init memblock_free_all(void)
pages = free_low_memory_core_early(); pages = free_low_memory_core_early();
totalram_pages_add(pages); totalram_pages_add(pages);
return pages;
} }
#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_ARCH_KEEP_MEMBLOCK) #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_ARCH_KEEP_MEMBLOCK)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment