ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-22 20:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'memblock-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2021-02-22 13:01:23 -08:00
parent 899cbb0e53 097d43d857
commit 7b7028edf9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/memblock.h
View File

@@ -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);

6
mm/memblock.c
View File

@@ -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)
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)