diff options
author | Richard Laager <rlaager@wiktel.com> | 2013-08-22 19:35:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-23 12:51:22 -0400 |
commit | ee8a99bdb47f32327bdfaffe35b900ca7161ba4e (patch) | |
tree | b5f9789be3fbbe01ffde0b9118a5da1b2f98031a /lib/lz4 | |
parent | 07555ac144bbf45b1751340c6ee75da1f4e5756d (diff) |
lib/lz4: correct the LZ4 license
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>
Diffstat (limited to 'lib/lz4')
-rw-r--r-- | lib/lz4/lz4_compress.c | 4 | ||||
-rw-r--r-- | lib/lz4/lz4_decompress.c | 6 | ||||
-rw-r--r-- | lib/lz4/lz4hc_compress.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/lz4/lz4_compress.c b/lib/lz4/lz4_compress.c index fd94058bd7f9..28321d8f75ef 100644 --- a/lib/lz4/lz4_compress.c +++ b/lib/lz4/lz4_compress.c | |||
@@ -437,7 +437,7 @@ int lz4_compress(const unsigned char *src, size_t src_len, | |||
437 | exit: | 437 | exit: |
438 | return ret; | 438 | return ret; |
439 | } | 439 | } |
440 | EXPORT_SYMBOL_GPL(lz4_compress); | 440 | EXPORT_SYMBOL(lz4_compress); |
441 | 441 | ||
442 | MODULE_LICENSE("GPL"); | 442 | MODULE_LICENSE("Dual BSD/GPL"); |
443 | MODULE_DESCRIPTION("LZ4 compressor"); | 443 | MODULE_DESCRIPTION("LZ4 compressor"); |
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c index d3414eae73a1..411be80ddb46 100644 --- a/lib/lz4/lz4_decompress.c +++ b/lib/lz4/lz4_decompress.c | |||
@@ -299,7 +299,7 @@ exit_0: | |||
299 | return ret; | 299 | return ret; |
300 | } | 300 | } |
301 | #ifndef STATIC | 301 | #ifndef STATIC |
302 | EXPORT_SYMBOL_GPL(lz4_decompress); | 302 | EXPORT_SYMBOL(lz4_decompress); |
303 | #endif | 303 | #endif |
304 | 304 | ||
305 | int lz4_decompress_unknownoutputsize(const char *src, size_t src_len, | 305 | int lz4_decompress_unknownoutputsize(const char *src, size_t src_len, |
@@ -319,8 +319,8 @@ exit_0: | |||
319 | return ret; | 319 | return ret; |
320 | } | 320 | } |
321 | #ifndef STATIC | 321 | #ifndef STATIC |
322 | EXPORT_SYMBOL_GPL(lz4_decompress_unknownoutputsize); | 322 | EXPORT_SYMBOL(lz4_decompress_unknownoutputsize); |
323 | 323 | ||
324 | MODULE_LICENSE("GPL"); | 324 | MODULE_LICENSE("Dual BSD/GPL"); |
325 | MODULE_DESCRIPTION("LZ4 Decompressor"); | 325 | MODULE_DESCRIPTION("LZ4 Decompressor"); |
326 | #endif | 326 | #endif |
diff --git a/lib/lz4/lz4hc_compress.c b/lib/lz4/lz4hc_compress.c index eb1a74f5e368..f344f76b6559 100644 --- a/lib/lz4/lz4hc_compress.c +++ b/lib/lz4/lz4hc_compress.c | |||
@@ -533,7 +533,7 @@ int lz4hc_compress(const unsigned char *src, size_t src_len, | |||
533 | exit: | 533 | exit: |
534 | return ret; | 534 | return ret; |
535 | } | 535 | } |
536 | EXPORT_SYMBOL_GPL(lz4hc_compress); | 536 | EXPORT_SYMBOL(lz4hc_compress); |
537 | 537 | ||
538 | MODULE_LICENSE("GPL"); | 538 | MODULE_LICENSE("Dual BSD/GPL"); |
539 | MODULE_DESCRIPTION("LZ4HC compressor"); | 539 | MODULE_DESCRIPTION("LZ4HC compressor"); |