diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-08 02:54:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-01-08 02:54:24 -0800 |
| commit | e9ffbf16caa6cb596df7fd641bc6063a922c52e6 (patch) | |
| tree | 027bb4eea13be27e960fc2df4e9ad3ca64cb8775 /mm | |
| parent | 9b43a525db125799df81e6fbef712a2ae50bfc5d (diff) | |
| parent | fa81ab49bbe4e1ce756581c970486de0ddb14309 (diff) | |
| download | linux-next-e9ffbf16caa6cb596df7fd641bc6063a922c52e6.tar.gz linux-next-e9ffbf16caa6cb596df7fd641bc6063a922c52e6.zip | |
Merge tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock fixes from Mike Rapoport:
"Small fixes in kernel-doc and tests:
- Fix kernel-doc for memblock_phys_free() to use correct names for
the counterpart allocation methods
- Fix compilation error in memblock tests"
* tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
memblock: Fix doc for memblock_phys_free
memblock tests: Fix compilation error.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 511d4783dcf1..d036c7861310 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -836,7 +836,7 @@ void __init_memblock memblock_free(void *ptr, size_t size) * @base: phys starting address of the boot memory block * @size: size of the boot memory block in bytes * - * Free boot memory block previously allocated by memblock_alloc_xx() API. + * Free boot memory block previously allocated by memblock_phys_alloc_xx() API. * The freeing memory will not be released to the buddy allocator. */ int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size) |