diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2012-05-31 16:26:46 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 17:49:33 -0700 | 
| commit | 0a4dd35c67b144d8ef9432120105f1aab9293ee9 (patch) | |
| tree | 2a97fd06c650ea75cf8438ea90e0f50776248793 | |
| parent | b32dfe377102ce668775f8b6b1461f7ad428f8b6 (diff) | |
| download | olio-linux-3.10-0a4dd35c67b144d8ef9432120105f1aab9293ee9.tar.xz olio-linux-3.10-0a4dd35c67b144d8ef9432120105f1aab9293ee9.zip  | |
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>
| -rw-r--r-- | init/Kconfig | 11 | ||||
| -rw-r--r-- | usr/Kconfig | 10 | 
2 files changed, 10 insertions, 11 deletions
diff --git a/init/Kconfig b/init/Kconfig index 81816b82860..7dca2cebec9 100644 --- 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. -	  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. @@ -176,10 +176,9 @@ config KERNEL_LZMA  	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" @@ -200,7 +199,7 @@ config KERNEL_LZO  	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. diff --git a/usr/Kconfig b/usr/Kconfig index 65b845bd4e3..085872bb2bb 100644 --- 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. -	  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. @@ -143,9 +143,9 @@ config INITRAMFS_COMPRESSION_LZMA  	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 @@ -161,7 +161,7 @@ config INITRAMFS_COMPRESSION_LZO  	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.  |