Commit e9ffbf16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 9b43a525 fa81ab49

mm/memblock.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

tools/testing/memblock/.gitignore

+1 −0
Original line number Diff line number Diff line 
main

memblock.c

linux/memblock.h

asm/asm.h

asm/cmpxchg.h

tools/testing/memblock/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -29,13 +29,14 @@ include: ../../../include/linux/memblock.h ../../include/linux/*.h \ 


	@mkdir -p linux

	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



memblock.c: $(EXTR_SRC)

	test -L memblock.c || ln -s $(EXTR_SRC) memblock.c



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:

	@echo  'Memblock simulator'