History

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.

Linus Torvalds committed 3 years ago

Commit e9ffbf12 parents 9b43a52 fa81ab43 files · +4 −2Browse files

Unified · Split

3 files
  1. mm/memblock.c +1 −1
  2. tools/testing/memblock/.gitignore +1 −0
  3. tools/testing/memblock/Makefile +2 −1
mm/memblock.c+1−1
@@ -836,7 +836,7 @@ void __init_memblock memblock_free(void *ptr, size_t size) · 835 unmodified lines
836 * @base: phys starting address of the boot memory block836 * @base: phys starting address of the boot memory block
837 * @size: size of the boot memory block in bytes837 * @size: size of the boot memory block in bytes
838 *838 *
839 * Free boot memory block previously allocated by memblock_alloc_xx() API.839 * Free boot memory block previously allocated by memblock_phys_alloc_xx() API.
840 * The freeing memory will not be released to the buddy allocator.840 * The freeing memory will not be released to the buddy allocator.
841 */841 */
842int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size)842int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size)
tools/testing/memblock/.gitignore+1−0
@@ -1,4 +1,5 @@
1main1main
2memblock.c2memblock.c
3linux/memblock.h3linux/memblock.h
4asm/asm.h
4asm/cmpxchg.h5asm/cmpxchg.h
tools/testing/memblock/Makefile+2−1
@@ -29,13 +29,14 @@ include: ../../../include/linux/memblock.h ../../include/linux/*.h \ · 28 unmodified lines
29 29
30 @mkdir -p linux30 @mkdir -p linux
31 test -L linux/memblock.h || ln -s ../../../../include/linux/memblock.h linux/memblock.h31 test -L linux/memblock.h || ln -s ../../../../include/linux/memblock.h linux/memblock.h
32 test -L asm/asm.h || ln -s ../../../arch/x86/include/asm/asm.h asm/asm.h
32 test -L asm/cmpxchg.h || ln -s ../../../arch/x86/include/asm/cmpxchg.h asm/cmpxchg.h33 test -L asm/cmpxchg.h || ln -s ../../../arch/x86/include/asm/cmpxchg.h asm/cmpxchg.h
33 34
34memblock.c: $(EXTR_SRC)35memblock.c: $(EXTR_SRC)
35 test -L memblock.c || ln -s $(EXTR_SRC) memblock.c36 test -L memblock.c || ln -s $(EXTR_SRC) memblock.c
36 37
37clean:38clean:
38 $(RM) $(TARGETS) $(OFILES) linux/memblock.h memblock.c asm/cmpxchg.h39 $(RM) $(TARGETS) $(OFILES) linux/memblock.h memblock.c asm/asm.h asm/cmpxchg.h
39 40
40help:41help:
41 @echo 'Memblock simulator'42 @echo 'Memblock simulator'