Merge branch 'zstd-minimal' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 6762529ad9e4597f473a07e9300bd0ac8a601c10..b1445b22a6def496d91bde16deb2b13a01a52915 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -192,6 +192,9 @@ config CRC8
          when they need to do cyclic redundancy check according CRC8
          algorithm. Module will be called crc8.
 
          when they need to do cyclic redundancy check according CRC8
          algorithm. Module will be called crc8.
 

+config XXHASH
+       tristate
+

 config AUDIT_GENERIC
        bool
        depends on AUDIT && !AUDIT_ARCH
 config AUDIT_GENERIC
        bool
        depends on AUDIT && !AUDIT_ARCH


@@ -246,6 +249,14 @@ config LZ4HC_COMPRESS
 config LZ4_DECOMPRESS
        tristate
 
 config LZ4_DECOMPRESS
        tristate
 

+config ZSTD_COMPRESS
+       select XXHASH
+       tristate
+
+config ZSTD_DECOMPRESS
+       select XXHASH
+       tristate
+

 source "lib/xz/Kconfig"
 
 #
 source "lib/xz/Kconfig"
 
 #


@@ -559,9 +570,6 @@ config ARCH_HAS_PMEM_API
 config ARCH_HAS_UACCESS_FLUSHCACHE
        bool
 
 config ARCH_HAS_UACCESS_FLUSHCACHE
        bool
 

-config ARCH_HAS_MMIO_FLUSH
-       bool
-

 config STACKDEPOT
        bool
        select STACKTRACE
 config STACKDEPOT
        bool
        select STACKTRACE


@@ -575,4 +583,7 @@ config PARMAN
 config PRIME_NUMBERS
        tristate
 
 config PRIME_NUMBERS
        tristate
 

+config STRING_SELFTEST
+       bool "Test string functions"
+

 endmenu
 endmenu