summaryrefslogtreecommitdiff
path: root/lib/zstd/decompress_sources.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-12-19 12:26:03 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2022-12-19 12:26:03 -0600
commit158738ea75059fb4ddf812e2cb9fe1ff6e22bc70 (patch)
tree41aa6e3bc58ed933dfcb885796fa3ba581ea2573 /lib/zstd/decompress_sources.h
parentaeba12b26c79fc35e07e511f692a8907037d95da (diff)
parent70d822cfb782ebed5c41bdad9fa520b5ec1c6923 (diff)
downloadlwn-158738ea75059fb4ddf812e2cb9fe1ff6e22bc70.tar.gz
lwn-158738ea75059fb4ddf812e2cb9fe1ff6e22bc70.zip
Merge tag 'zstd-linus-v6.2' of https://github.com/terrelln/linux
Pull zstd updates from Nick Terrell: "Update the kernel to upstream zstd v1.5.2 [0]. Specifically to the tag v1.5.2-kernel [1] which includes several cherrypicked fixes for the kernel on top of v1.5.2. Excepting the MAINTAINERS change, all the changes in this can be generated by: git clone https://github.com/facebook/zstd cd zstd/contrib/linux-kernel git checkout v1.5.2-kernel LINUX=/path/to/linux/repo make import Additionally, this includes several minor typo fixes, which have all been fixed upstream so they are maintained on the next import" Link: https://github.com/facebook/zstd/releases/tag/v1.5.2 [0] Link: https://github.com/facebook/zstd/tree/v1.5.2-kernel [1] Link: https://lore.kernel.org/lkml/20221024202606.404049-1-nickrterrell@gmail.com/ Link: https://github.com/torvalds/linux/commit/637a642f5ca5e850186bb64ac75ebb0f124b458d * tag 'zstd-linus-v6.2' of https://github.com/terrelln/linux: zstd: import usptream v1.5.2 zstd: Move zstd-common module exports to zstd_common_module.c lib: zstd: Fix comment typo lib: zstd: fix repeated words in comments MAINTAINERS: git://github -> https://github.com for terrelln lib: zstd: clean up double word in comment.
Diffstat (limited to 'lib/zstd/decompress_sources.h')
-rw-r--r--lib/zstd/decompress_sources.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h
index 0fbec508f285..a06ca187aab5 100644
--- a/lib/zstd/decompress_sources.h
+++ b/lib/zstd/decompress_sources.h
@@ -16,6 +16,12 @@
* decompression.
*/
+/*
+ * Disable the ASM Huffman implementation because we need to
+ * include all the sources.
+ */
+#define ZSTD_DISABLE_ASM 1
+
#include "common/debug.c"
#include "common/entropy_common.c"
#include "common/error_private.c"