sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xz: fix arm fdt compile error for kmalloc replacement 

Align to the commit bf4afc53b7 ("Convert 'alloc_obj' family to use the
new default GFP_KERNEL argument") update the 'kmalloc_obj' declaration
for userspace to fix below compile error:

  In file included from arch/arm/boot/compressed/../../../../lib/decompress_unxz.c:241,
                   from arch/arm/boot/compressed/decompress.c:56:
  arch/arm/boot/compressed/../../../../lib/xz/xz_dec_stream.c: In function 'xz_dec_init':
  arch/arm/boot/compressed/../../../../lib/xz/xz_dec_stream.c:787:28: error: implicit declaration of function 'kmalloc_obj'; did you mean 'kmalloc'? [-Wimplicit-function-declaration]
     787 |         struct xz_dec *s = kmalloc_obj(*s);
         |                            ^~~~~~~~~~~
         |                            kmalloc

Signed-off-by: Haiyue Wang <haiyuewa@163.com>
Fixes: 69050f8d6d ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
Fixes: bf4afc53b7 ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")
Reviewed-by: Kees Cook <kees@kernel.org>
Acked-by: Lasse Collin <lasse.collin@tukaani.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Haiyue Wang 2026-02-22 20:11:00 +08:00 committed by Linus Torvalds
parent 5f2eac7767
commit fd1d6b9d13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/decompress_unxz.c
View File

@ -157,11 +157,11 @@
* when XZ_DYNALLOC is used, but the pre-boot free() doesn't support it. * when XZ_DYNALLOC is used, but the pre-boot free() doesn't support it.
* Workaround it here because the other decompressors don't need it. * Workaround it here because the other decompressors don't need it.
*/ */
#undef kmalloc #undef kmalloc_obj
#undef kfree #undef kfree
#undef vmalloc #undef vmalloc
#undef vfree #undef vfree
#define kmalloc(size, flags) malloc(size) #define kmalloc_obj(type) malloc(sizeof(type))
#define kfree(ptr) free(ptr) #define kfree(ptr) free(ptr)
#define vmalloc(size) malloc(size) #define vmalloc(size) malloc(size)
#define vfree(ptr) do { if (ptr != NULL) free(ptr); } while (0) #define vfree(ptr) do { if (ptr != NULL) free(ptr); } while (0)