kconfig: update compression algorithm info

There have been new compression algorithms added without updating nearby
relevant descriptive text that refers to (a) the number of compression
algorithms and (b) the most recent one.  Fix these inconsistencies.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Reported-by: <qasdfgtyuiop@gmail.com>
Cc: Lasse Collin <lasse.collin@tukaani.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: Alain Knaff <alain@knaff.lu>
Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/init/Kconfig b/init/Kconfig
index 81816b8..7dca2ce 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -167,7 +167,7 @@ config KERNEL_BZIP2
        depends on HAVE_KERNEL_BZIP2
        help
          Its compression ratio and speed is intermediate.
        depends on HAVE_KERNEL_BZIP2
        help
          Its compression ratio and speed is intermediate.

-         Decompression speed is slowest among the three.  The kernel
+         Decompression speed is slowest among the choices.  The kernel

          size is about 10% smaller with bzip2, in comparison to gzip.
          Bzip2 uses a large amount of memory. For modern kernels you
          will need at least 8MB RAM or more for booting.
          size is about 10% smaller with bzip2, in comparison to gzip.
          Bzip2 uses a large amount of memory. For modern kernels you
          will need at least 8MB RAM or more for booting.


@@ -176,10 +176,9 @@ config KERNEL_LZMA
        bool "LZMA"
        depends on HAVE_KERNEL_LZMA
        help
        bool "LZMA"
        depends on HAVE_KERNEL_LZMA
        help

-         The most recent compression algorithm.
-         Its ratio is best, decompression speed is between the other
-         two. Compression is slowest.  The kernel size is about 33%
-         smaller with LZMA in comparison to gzip.
+         This compression algorithm's ratio is best.  Decompression speed
+         is between gzip and bzip2.  Compression is slowest.
+         The kernel size is about 33% smaller with LZMA in comparison to gzip.

 
 config KERNEL_XZ
        bool "XZ"
 
 config KERNEL_XZ
        bool "XZ"


@@ -200,7 +199,7 @@ config KERNEL_LZO
        bool "LZO"
        depends on HAVE_KERNEL_LZO
        help
        bool "LZO"
        depends on HAVE_KERNEL_LZO
        help

-         Its compression ratio is the poorest among the 4. The kernel
+         Its compression ratio is the poorest among the choices. The kernel

          size is about 10% bigger than gzip; however its speed
          (both compression and decompression) is the fastest.
 
          size is about 10% bigger than gzip; however its speed
          (both compression and decompression) is the fastest.
 

diff --git a/usr/Kconfig b/usr/Kconfig
index 65b845b..085872b 100644 (file)
--- a/usr/Kconfig
+++ b/usr/Kconfig
@@ -134,7 +134,7 @@ config INITRAMFS_COMPRESSION_BZIP2
        depends on RD_BZIP2
        help
          Its compression ratio and speed is intermediate.
        depends on RD_BZIP2
        help
          Its compression ratio and speed is intermediate.

-         Decompression speed is slowest among the four.  The initramfs
+         Decompression speed is slowest among the choices.  The initramfs

          size is about 10% smaller with bzip2, in comparison to gzip.
          Bzip2 uses a large amount of memory. For modern kernels you
          will need at least 8MB RAM or more for booting.
          size is about 10% smaller with bzip2, in comparison to gzip.
          Bzip2 uses a large amount of memory. For modern kernels you
          will need at least 8MB RAM or more for booting.


@@ -143,9 +143,9 @@ config INITRAMFS_COMPRESSION_LZMA
        bool "LZMA"
        depends on RD_LZMA
        help
        bool "LZMA"
        depends on RD_LZMA
        help

-         The most recent compression algorithm.
-         Its ratio is best, decompression speed is between the other
-         three. Compression is slowest. The initramfs size is about 33%
+         This algorithm's compression ratio is best.
+         Decompression speed is between the other choices.
+         Compression is slowest. The initramfs size is about 33%

          smaller with LZMA in comparison to gzip.
 
 config INITRAMFS_COMPRESSION_XZ
          smaller with LZMA in comparison to gzip.
 
 config INITRAMFS_COMPRESSION_XZ


@@ -161,7 +161,7 @@ config INITRAMFS_COMPRESSION_LZO
        bool "LZO"
        depends on RD_LZO
        help
        bool "LZO"
        depends on RD_LZO
        help

-         Its compression ratio is the poorest among the four. The kernel
+         Its compression ratio is the poorest among the choices. The kernel

          size is about 10% bigger than gzip; however its speed
          (both compression and decompression) is the fastest.
 
          size is about 10% bigger than gzip; however its speed
          (both compression and decompression) is the fastest.