diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-02-16 23:39:32 +0100 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-02-16 23:48:23 +0100 |
| commit | 0e43f62f21f10d4ee3c151f86d15784a9ec21d69 (patch) | |
| tree | 26da213c16ee41858d547ccf0af98e7a569cc264 /target/linux/generic/hack-5.10 | |
| parent | 0c7340f0a2027856af8b87d3f9b5295922c2e37d (diff) | |
| download | upstream-0e43f62f21f10d4ee3c151f86d15784a9ec21d69.tar.gz upstream-0e43f62f21f10d4ee3c151f86d15784a9ec21d69.tar.bz2 upstream-0e43f62f21f10d4ee3c151f86d15784a9ec21d69.zip | |
kernel: 5.10: refresh patches
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/hack-5.10')
| -rw-r--r-- | target/linux/generic/hack-5.10/531-debloat_lzma.patch | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/target/linux/generic/hack-5.10/531-debloat_lzma.patch b/target/linux/generic/hack-5.10/531-debloat_lzma.patch index 0854872ffa..2f70eee3e9 100644 --- a/target/linux/generic/hack-5.10/531-debloat_lzma.patch +++ b/target/linux/generic/hack-5.10/531-debloat_lzma.patch @@ -710,26 +710,26 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> { UInt32 dicSize; Byte d; -@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma +@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma return SZ_OK; } -SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) --{ -- CLzmaProps propNew; -- RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); -- p->prop = propNew; -- return SZ_OK; --} -- --SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) { CLzmaProps propNew; -- SizeT dicBufSize; RINOK(LzmaProps_Decode(&propNew, props, propsSize)); - RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); +@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, + p->prop = propNew; + return SZ_OK; + } +- +-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +-{ +- CLzmaProps propNew; +- SizeT dicBufSize; +- RINOK(LzmaProps_Decode(&propNew, props, propsSize)); +- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); - dicBufSize = propNew.dicSize; - if (p->dic == 0 || dicBufSize != p->dicBufSize) - { @@ -742,9 +742,12 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> - } - } - p->dicBufSize = dicBufSize; - p->prop = propNew; - return SZ_OK; - } +- p->prop = propNew; +- return SZ_OK; +-} + + SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, + const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, --- a/lib/lzma/LzmaEnc.c +++ b/lib/lzma/LzmaEnc.c @@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p) |