Skip to content

Commit

Permalink
lib/xz: Put CRC32_POLY_LE in xz_private.h
Browse files Browse the repository at this point in the history
This fixes a regression introduced by faa16bc ("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: faa16bc ("lib: Use existing define with polynomial")
Reported-by: Meelis Roos <mroos@linux.ee>
Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Christophe LEROY <christophe.leroy@c-s.fr>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Tested-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Joel Stanley authored and Michael Ellerman committed Oct 1, 2018
1 parent 7e0cf1c commit 242cdad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 0 additions & 1 deletion lib/xz/xz_crc32.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* but they are bigger and use more memory for the lookup table.
*/

#include <linux/crc32poly.h>
#include "xz_private.h"

/*
Expand Down
4 changes: 4 additions & 0 deletions lib/xz/xz_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -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().
Expand Down

0 comments on commit 242cdad

Please sign in to comment.