Commit 242cdad8 authored by Joel Stanley's avatar Joel Stanley Committed by Michael Ellerman

lib/xz: Put CRC32_POLY_LE in xz_private.h

This fixes a regression introduced by faa16bc4 ("lib: Use
existing define with polynomial").

The cleanup added a dependency on include/linux, which broke the PowerPC
boot wrapper/decompresser when KERNEL_XZ is enabled:

  BOOTCC  arch/powerpc/boot/decompress.o
 In file included from arch/powerpc/boot/../../../lib/decompress_unxz.c:233,
                 from arch/powerpc/boot/decompress.c:42:
 arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:10: fatal error:
 linux/crc32poly.h: No such file or directory
  #include <linux/crc32poly.h>
           ^~~~~~~~~~~~~~~~~~~

The powerpc decompresser is a hairy corner of the kernel. Even while building
a 64-bit kernel it needs to build a 32-bit binary and therefore avoid including
files from include/linux.

This allows users of the xz library to avoid including headers from
'include/linux/' while still achieving the cleanup of the magic number.

Fixes: faa16bc4 ("lib: Use existing define with polynomial")
Reported-by: Meelis Roos's avatarMeelis Roos <mroos@linux.ee>
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Suggested-by: default avatarChristophe LEROY <christophe.leroy@c-s.fr>
Signed-off-by: Joel Stanley's avatarJoel Stanley <joel@jms.id.au>
Tested-by: Meelis Roos's avatarMeelis Roos <mroos@linux.ee>
Signed-off-by: Michael Ellerman's avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7e0cf1c9
......@@ -15,7 +15,6 @@
* but they are bigger and use more memory for the lookup table.
*/
#include <linux/crc32poly.h>
#include "xz_private.h"
/*
......
......@@ -102,6 +102,10 @@
# endif
#endif
#ifndef CRC32_POLY_LE
#define CRC32_POLY_LE 0xedb88320
#endif
/*
* Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
* before calling xz_dec_lzma2_run().
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment