diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-01-13 03:56:47 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-13 04:59:56 +0100 |
| commit | a99da46ac01a12e582684771b486c9292326d7a4 (patch) | |
| tree | 498c7833f9efc9a35c99fa281ada1527c4b01f97 /mm/memblock.c | |
| parent | Merge branch 'vsock-update-tools-and-error-handling' (diff) | |
| parent | Merge tag 'net-6.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-a99da46ac01a12e582684771b486c9292326d7a4.tar.xz linux-a99da46ac01a12e582684771b486c9292326d7a4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/usb/r8152.c
be53771c87f4 ("r8152: add vendor/device ID pair for Microsoft Devkit")
ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
https://lore.kernel.org/all/20230113113339.658c4723@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'mm/memblock.c')
| -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) |