diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-14 17:03:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-14 17:03:25 -0700 |
| commit | ed38ff164fba98a21993c95d240013f32309ccab (patch) | |
| tree | df6df1f7f06bf3d689fbd2c7bb9ea927e7d01ac3 /lib/zstd/common/zstd_deps.h | |
| parent | c0856b7c14b690ef9917cdb1d94e96169212e43b (diff) | |
| parent | 6906598f1ce93761716d780b6e3f171e13f0f4ce (diff) | |
Merge tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux
Pull zstd fixes from Nick Terrell:
"A small number of fixes for zstd-v1.5.2.
I'm not pulling in zstd-v1.5.4 from upstream this release because it
didn't have any time to bake in linux-next, but I'm aiming for the
next update in v6.4"
* tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux:
zstd: Fix definition of assert()
lib: zstd: Backport fix for in-place decompression
lib: zstd: Fix -Wstringop-overflow warning
Diffstat (limited to 'lib/zstd/common/zstd_deps.h')
| -rw-r--r-- | lib/zstd/common/zstd_deps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h index 7a5bf44839c9..f06df065dec0 100644 --- a/lib/zstd/common/zstd_deps.h +++ b/lib/zstd/common/zstd_deps.h @@ -84,7 +84,7 @@ static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) { #include <linux/kernel.h> -#define assert(x) WARN_ON((x)) +#define assert(x) WARN_ON(!(x)) #endif /* ZSTD_DEPS_ASSERT */ #endif /* ZSTD_DEPS_NEED_ASSERT */ |