Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee8a99bd authored by Richard Laager's avatar Richard Laager Committed by Linus Torvalds
Browse files

lib/lz4: correct the LZ4 license 



The LZ4 code is listed as using the "BSD 2-Clause License".

Signed-off-by: default avatarRichard Laager <rlaager@wiktel.com>
Acked-by: default avatarKyungsik Lee <kyungsik.lee@lge.com>
Cc: Chanho Min <chanho.min@lge.com>
Cc: Richard Yao <ryao@gentoo.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
[ The 2-clause BSD can be just converted into GPL, but that's rude and
  pointless, so don't do it   - Linus ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 07555ac1

lib/lz4/lz4_compress.c

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ int lz4_compress(const unsigned char *src, size_t src_len, 
exit:

	return ret;

}

EXPORT_SYMBOL_GPL(lz4_compress);

EXPORT_SYMBOL(lz4_compress);



MODULE_LICENSE("GPL");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_DESCRIPTION("LZ4 compressor");

lib/lz4/lz4_decompress.c

+3 −3
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ exit_0: 
	return ret;

}

#ifndef STATIC

EXPORT_SYMBOL_GPL(lz4_decompress);

EXPORT_SYMBOL(lz4_decompress);

#endif



int lz4_decompress_unknownoutputsize(const char *src, size_t src_len,
@@ -319,8 +319,8 @@ exit_0: 
	return ret;

}

#ifndef STATIC

EXPORT_SYMBOL_GPL(lz4_decompress_unknownoutputsize);

EXPORT_SYMBOL(lz4_decompress_unknownoutputsize);



MODULE_LICENSE("GPL");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_DESCRIPTION("LZ4 Decompressor");

#endif

lib/lz4/lz4hc_compress.c

+2 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ int lz4hc_compress(const unsigned char *src, size_t src_len, 
exit:

	return ret;

}

EXPORT_SYMBOL_GPL(lz4hc_compress);

EXPORT_SYMBOL(lz4hc_compress);



MODULE_LICENSE("GPL");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_DESCRIPTION("LZ4HC compressor");