iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'fixes-2023-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock

Browse Source 
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.
This commit is contained in:
Linus Torvalds
2023-01-08 02:54:24 -08:00
parent 9b43a525db fa81ab49bb
commit e9ffbf16ca
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mm/memblock.c
View File

@@ -836,7 +836,7 @@ void __init_memblock memblock_free(void *ptr, size_t size)
* @base: phys starting address of the boot memory block * @base: phys starting address of the boot memory block
* @size: size of the boot memory block in bytes * @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. * 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) int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size)

1
tools/testing/memblock/.gitignore vendored
View File

@@ -1,4 +1,5 @@
main main
memblock.c memblock.c
linux/memblock.h linux/memblock.h
asm/asm.h
asm/cmpxchg.h asm/cmpxchg.h

3
tools/testing/memblock/Makefile
View File

@@ -29,13 +29,14 @@ include: ../../../include/linux/memblock.h ../../include/linux/*.h \
@mkdir -p linux @mkdir -p linux
test -L linux/memblock.h || ln -s ../../../../include/linux/memblock.h linux/memblock.h test -L linux/memblock.h || ln -s ../../../../include/linux/memblock.h linux/memblock.h
test -L asm/asm.h || ln -s ../../../arch/x86/include/asm/asm.h asm/asm.h
test -L asm/cmpxchg.h || ln -s ../../../arch/x86/include/asm/cmpxchg.h asm/cmpxchg.h test -L asm/cmpxchg.h || ln -s ../../../arch/x86/include/asm/cmpxchg.h asm/cmpxchg.h
memblock.c: $(EXTR_SRC) memblock.c: $(EXTR_SRC)
test -L memblock.c || ln -s $(EXTR_SRC) memblock.c test -L memblock.c || ln -s $(EXTR_SRC) memblock.c
clean: clean:
$(RM) $(TARGETS) $(OFILES) linux/memblock.h memblock.c asm/cmpxchg.h $(RM) $(TARGETS) $(OFILES) linux/memblock.h memblock.c asm/asm.h asm/cmpxchg.h
help: help:
@echo 'Memblock simulator' @echo 'Memblock simulator'