Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+4
-2
+1
-1
mm/memblock.c
+1
-1
mm/memblock.c
···
836
836
* @base: phys starting address of the boot memory block
837
837
* @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
840
* The freeing memory will not be released to the buddy allocator.
841
841
*/
842
842
int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size)
+1
tools/testing/memblock/.gitignore
+1
tools/testing/memblock/.gitignore
+2
-1
tools/testing/memblock/Makefile
+2
-1
tools/testing/memblock/Makefile
···
29
29
30
30
@mkdir -p linux
31
31
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
33
test -L asm/cmpxchg.h || ln -s ../../../arch/x86/include/asm/cmpxchg.h asm/cmpxchg.h
33
34
34
35
memblock.c: $(EXTR_SRC)
35
36
test -L memblock.c || ln -s $(EXTR_SRC) memblock.c
36
37
37
38
clean:
38
-
$(RM) $(TARGETS) $(OFILES) linux/memblock.h memblock.c asm/cmpxchg.h
39
+
$(RM) $(TARGETS) $(OFILES) linux/memblock.h memblock.c asm/asm.h asm/cmpxchg.h
39
40
40
41
help:
41
42
@echo 'Memblock simulator'