Skip to content

Commit

Permalink
lib/lz4: correct the LZ4 license
Browse files Browse the repository at this point in the history
The LZ4 code is listed as using the "BSD 2-Clause License".

Signed-off-by: Richard Laager <rlaager@wiktel.com>
Acked-by: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: Chanho Min <chanho.min@lge.com>
Cc: Richard Yao <ryao@gentoo.org>
Signed-off-by: Andrew 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: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Richard Laager authored and Linus Torvalds committed Aug 23, 2013
1 parent 07555ac commit ee8a99b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/lz4/lz4_compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
6 changes: 3 additions & 3 deletions lib/lz4/lz4_decompress.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ int lz4_decompress(const char *src, size_t *src_len, char *dest,
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,
Expand All @@ -319,8 +319,8 @@ int lz4_decompress_unknownoutputsize(const char *src, size_t src_len,
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
4 changes: 2 additions & 2 deletions lib/lz4/lz4hc_compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

0 comments on commit ee8a99b

Please sign in to comment.