]> git.baikalelectronics.ru Git - kernel.git/commitdiff
tools/bootconfig: Define memblock_free_ptr() to fix build error
authorMasami Hiramatsu <mhiramat@kernel.org>
Wed, 15 Sep 2021 00:53:38 +0000 (09:53 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 15 Sep 2021 16:49:48 +0000 (09:49 -0700)
The lib/bootconfig.c file is shared with the 'bootconfig' tooling, and
as a result, the changes incommit 14cda2ccc54b ("memblock: introduce
saner 'memblock_free_ptr()' interface") need to also be reflected in the
tooling header file.

So define the new memblock_free_ptr() wrapper, and remove unused __pa()
and memblock_free().

Fixes: 14cda2ccc54b ("memblock: introduce saner 'memblock_free_ptr()' interface")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
tools/bootconfig/include/linux/memblock.h

index 7862f217d85d37d234d4679c32ebe7e988a0580b..f2e506f7d57f92e59f933643c197e31bfe889dcd 100644 (file)
@@ -4,9 +4,8 @@
 
 #include <stdlib.h>
 
-#define __pa(addr)     (addr)
 #define SMP_CACHE_BYTES        0
 #define memblock_alloc(size, align)    malloc(size)
-#define memblock_free(paddr, size)     free(paddr)
+#define memblock_free_ptr(paddr, size) free(paddr)
 
 #endif