| Message ID | 20180921025431.28366-1-joel@jms.id.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 242cdad873a75652f97c35aad61270581e0f3a2e |
| Headers | show |
| Series | lib/xz: Put CRC32_POLY_LE in xz_private.h | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | fail | Test checkpatch on branch next |
| snowpatch_ozlabs/build-ppc64le | success | Test build-ppc64le on branch next |
| snowpatch_ozlabs/build-ppc64be | success | Test build-ppc64be on branch next |
| snowpatch_ozlabs/build-ppc64e | success | Test build-ppc64e on branch next |
| snowpatch_ozlabs/build-ppc32 | success | Test build-ppc32 on branch next |
> This fixes a regression introduced by faa16bc404d72a5 ("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: faa16bc404d72a5 ("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>
On Fri, 2018-09-21 at 02:54:31 UTC, Joel Stanley wrote: > This fixes a regression introduced by faa16bc404d72a5 ("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: faa16bc404d72a5 ("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> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/242cdad873a75652f97c35aad61270 cheers
diff --git a/lib/xz/xz_crc32.c b/lib/xz/xz_crc32.c index 25a5d87e2e4c..912aae5fa09e 100644 --- a/lib/xz/xz_crc32.c +++ b/lib/xz/xz_crc32.c @@ -15,7 +15,6 @@ * but they are bigger and use more memory for the lookup table. */ -#include <linux/crc32poly.h> #include "xz_private.h" /* diff --git a/lib/xz/xz_private.h b/lib/xz/xz_private.h index 482b90f363fe..09360ebb510e 100644 --- a/lib/xz/xz_private.h +++ b/lib/xz/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().
This fixes a regression introduced by faa16bc404d72a5 ("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: faa16bc404d72a5 ("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> --- lib/xz/xz_crc32.c | 1 - lib/xz/xz_private.h | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)